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/image_test.cc

diff --git a/src/image_test.cc b/src/image_test.cc
index bd30e71..34e243d 100644
--- a/src/image_test.cc
+++ b/src/image_test.cc
@@ -36,8 +36,8 @@
   ASSERT_TRUE(success);
 
   {
-    scoped_ptr<File> file(OS::OpenFile(tmp.GetFilename(), false));
-    ASSERT_TRUE(file != NULL);
+    UniquePtr<File> file(OS::OpenFile(tmp.GetFilename(), false));
+    ASSERT_TRUE(file.get() != NULL);
     ImageHeader image_header;
     file->ReadFully(&image_header, sizeof(image_header));
     ASSERT_TRUE(image_header.IsValid());
@@ -51,8 +51,8 @@
   // lucky by pointers that happen to work referencing the earlier
   // dex.
   delete java_lang_dex_file_.release();
-  scoped_ptr<const DexFile> dex(GetLibCoreDex());
-  ASSERT_TRUE(dex != NULL);
+  UniquePtr<const DexFile> dex(GetLibCoreDex());
+  ASSERT_TRUE(dex.get() != NULL);
 
   std::vector<const DexFile*> boot_class_path;
   boot_class_path.push_back(dex.get());
@@ -64,7 +64,7 @@
   options.push_back(std::make_pair(boot_image.c_str(), reinterpret_cast<void*>(NULL)));
 
   runtime_.reset(Runtime::Create(options, false));
-  ASSERT_TRUE(runtime_ != NULL);
+  ASSERT_TRUE(runtime_.get() != NULL);
   class_linker_ = runtime_->GetClassLinker();
 
   ASSERT_EQ(2U, Heap::GetSpaces().size());