commit 0e073f7b9386a461b470d30415a96480ab1b76af
author Ian Rogers <irogers@google.com> Fri Sep 09 10:45:46 2011 -0700
committer Ian Rogers <irogers@google.com> Fri Sep 09 10:45:46 2011 -0700
tree 894997452038b78246301da71ae88b6a9ac663f5
parent 630ddde46e52f5fbeba61227000152b0a99131a4

Make CommonTest.compiler_ a UniquePtr

Change-Id: I80e8b0108ea9da7cdd352f42715abe48edf8bf15

src/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index 1f3f063..fdea986 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -110,11 +110,9 @@
     class_linker_ = runtime_->GetClassLinker();
 
 #if defined(__i386__)
-    compiler_ = new Compiler(kX86);
+    compiler_.reset(new Compiler(kX86));
 #elif defined(__arm__)
-    compiler_ = new Compiler(kThumb2);
-#else
-    compiler_ = new Compiler(kNone);
+    compiler_.reset(new Compiler(kThumb2));
 #endif
 
     Heap::VerifyHeap();  // Check for heap corruption before the test
@@ -157,7 +155,7 @@
     IcuCleanupFn icu_cleanup_fn = reinterpret_cast<IcuCleanupFn>(sym);
     (*icu_cleanup_fn)();
 
-    delete compiler_;
+    compiler_.reset();
 
     Heap::VerifyHeap();  // Check for heap corruption after the test
   }
@@ -285,8 +283,9 @@
   UniquePtr<const DexFile> java_lang_dex_file_;
   std::vector<const DexFile*> boot_class_path_;
   UniquePtr<Runtime> runtime_;
+  // Owned by the runtime
   ClassLinker* class_linker_;
-  Compiler* compiler_;
+  UniquePtr<Compiler> compiler_;
 
  private:
   std::vector<const DexFile*> loaded_dex_files_;