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/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index 4fcf44d..bb9b93c 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -5,18 +5,17 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "UniquePtr.h"
 #include "base64.h"
-#include "heap.h"
-#include "thread.h"
-#include "stringprintf.h"
 #include "class_linker.h"
 #include "dex_file.h"
-
+#include "heap.h"
+#include "gtest/gtest.h"
+#include "stringprintf.h"
+#include "thread.h"
 #include "unicode/uclean.h"
 #include "unicode/uvernum.h"
 
-#include "gtest/gtest.h"
-
 namespace art {
 
 static inline const DexFile* OpenDexFileBase64(const char* base64,
@@ -86,7 +85,7 @@
     boot_class_path_.push_back(java_lang_dex_file_.get());
 
     runtime_.reset(Runtime::Create(boot_class_path_));
-    ASSERT_TRUE(runtime_ != NULL);
+    ASSERT_TRUE(runtime_.get() != NULL);
     class_linker_ = runtime_->GetClassLinker();
   }
 
@@ -168,9 +167,9 @@
   bool is_host_;
   std::string android_data_;
   std::string art_cache_;
-  scoped_ptr<const DexFile> java_lang_dex_file_;
+  UniquePtr<const DexFile> java_lang_dex_file_;
   std::vector<const DexFile*> boot_class_path_;
-  scoped_ptr<Runtime> runtime_;
+  UniquePtr<Runtime> runtime_;
   ClassLinker* class_linker_;
 };