commit 90a3369d3b6238f1a4c9b19ca68978dab1c39bc4
author Elliott Hughes <enh@google.com> Tue Aug 30 13:27:07 2011 -0700
committer Elliott Hughes <enh@google.com> Tue Aug 30 13:27:45 2011 -0700
tree b66ec9b2cced5713bd5902c499d57b533d2e7a9a
parent 34023801bd544e613d6e85c9a5b2e743f3710e8f

Switch to UniquePtr.

Only one use of scoped_ptr was incorrect (but then again, I spent an afternoon
with valgrind finding and fixing them just last week).

Change-Id: If5ec1c8aa0794a4f652bfd1c0fffccf95facdc40

src/zip_archive_test.cc

diff --git a/src/zip_archive_test.cc b/src/zip_archive_test.cc
index 19f4ee0..e6b4002 100644
--- a/src/zip_archive_test.cc
+++ b/src/zip_archive_test.cc
@@ -1,28 +1,30 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
 
+#include "zip_archive.h"
+
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "UniquePtr.h"
 #include "common_test.h"
-#include "os.h"
-#include "zip_archive.h"
 #include "gtest/gtest.h"
+#include "os.h"
 
 namespace art {
 
 class ZipArchiveTest : public CommonTest {};
 
 TEST_F(ZipArchiveTest, FindAndExtract) {
-  scoped_ptr<ZipArchive> zip_archive(ZipArchive::Open(GetLibCoreDexFileName()));
-  ASSERT_TRUE(zip_archive != false);
-  scoped_ptr<ZipEntry> zip_entry(zip_archive->Find("classes.dex"));
-  ASSERT_TRUE(zip_entry != false);
+  UniquePtr<ZipArchive> zip_archive(ZipArchive::Open(GetLibCoreDexFileName()));
+  ASSERT_TRUE(zip_archive.get() != false);
+  UniquePtr<ZipEntry> zip_entry(zip_archive->Find("classes.dex"));
+  ASSERT_TRUE(zip_entry.get() != false);
 
   ScratchFile tmp;
   ASSERT_NE(-1, tmp.GetFd());
-  scoped_ptr<File> file(OS::FileFromFd(tmp.GetFilename(), tmp.GetFd()));
-  ASSERT_TRUE(file != NULL);
+  UniquePtr<File> file(OS::FileFromFd(tmp.GetFilename(), tmp.GetFd()));
+  ASSERT_TRUE(file.get() != NULL);
   bool success = zip_entry->Extract(*file);
   ASSERT_TRUE(success);
   close(tmp.GetFd());