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

diff --git a/src/dex_file_test.cc b/src/dex_file_test.cc
index 96d0477..4271d0c 100644
--- a/src/dex_file_test.cc
+++ b/src/dex_file_test.cc
@@ -1,18 +1,19 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
 
-#include "common_test.h"
 #include "dex_file.h"
-#include "scoped_ptr.h"
 
 #include <stdio.h>
 
+#include "UniquePtr.h"
+#include "common_test.h"
+
 namespace art {
 
 class DexFileTest : public CommonTest {};
 
 TEST_F(DexFileTest, Open) {
-  scoped_ptr<const DexFile> dex(OpenTestDexFile("Nested"));
-  ASSERT_TRUE(dex != NULL);
+  UniquePtr<const DexFile> dex(OpenTestDexFile("Nested"));
+  ASSERT_TRUE(dex.get() != NULL);
 }
 
 // Although this is the same content logically as the Nested test dex,
@@ -42,8 +43,8 @@
   "AAMgAAACAAAAiAIAAAQgAAADAAAAlAIAAAAgAAACAAAAqwIAAAAQAAABAAAAxAIAAA==";
 
 TEST_F(DexFileTest, Header) {
-  scoped_ptr<const DexFile> raw(OpenDexFileBase64(kRawDex, "kRawDex"));
-  ASSERT_TRUE(raw != NULL);
+  UniquePtr<const DexFile> raw(OpenDexFileBase64(kRawDex, "kRawDex"));
+  ASSERT_TRUE(raw.get() != NULL);
 
   const DexFile::Header& header = raw->GetHeader();
   // TODO: header.magic_
@@ -70,8 +71,8 @@
 }
 
 TEST_F(DexFileTest, ClassDefs) {
-  scoped_ptr<const DexFile> raw(OpenTestDexFile("Nested"));
-  ASSERT_TRUE(raw != NULL);
+  UniquePtr<const DexFile> raw(OpenTestDexFile("Nested"));
+  ASSERT_TRUE(raw.get() != NULL);
   EXPECT_EQ(2U, raw->NumClassDefs());
 
   const DexFile::ClassDef& c0 = raw->GetClassDef(0);
@@ -82,8 +83,8 @@
 }
 
 TEST_F(DexFileTest, CreateMethodDescriptor) {
-  scoped_ptr<const DexFile> raw(OpenTestDexFile("CreateMethodDescriptor"));
-  ASSERT_TRUE(raw != NULL);
+  UniquePtr<const DexFile> raw(OpenTestDexFile("CreateMethodDescriptor"));
+  ASSERT_TRUE(raw.get() != NULL);
   EXPECT_EQ(1U, raw->NumClassDefs());
 
   const DexFile::ClassDef& class_def = raw->GetClassDef(0);