commit e0fc0ef0facabaf44b6fd460db4469ab0dab9696
author Elliott Hughes <enh@google.com> Fri Aug 12 17:39:17 2011 -0700
committer Elliott Hughes <enh@google.com> Fri Aug 12 17:39:17 2011 -0700
tree f887577ed88b685e97381dbb597bf6cc13dc6fc8
parent 91779c841f8bfaf2416576d0c44fa5f50f95b60b

Fix a few more scoped_ptr/scoped_array confusions, and stop tring to optimistically load non-existent .dex files.

Change-Id: I0c12a731bdf1da49f2f51665181e5b4d2b423ba2

src/dex_file_test.cc

diff --git a/src/dex_file_test.cc b/src/dex_file_test.cc
index 33c43c9..616e1c4 100644
--- a/src/dex_file_test.cc
+++ b/src/dex_file_test.cc
@@ -79,8 +79,8 @@
     const char* name = raw->dexStringById(method_id.name_idx_);
     ASSERT_STREQ("<init>", name);
     int32_t length;
-    scoped_ptr<const char> descriptor(raw->CreateMethodDescriptor(proto_idx,
-                                                                  &length));
+    scoped_array<const char> descriptor(raw->CreateMethodDescriptor(proto_idx,
+        &length));
     ASSERT_STREQ("()V", descriptor.get());
   }
 
@@ -98,8 +98,8 @@
 
     uint32_t proto_idx = method_id.proto_idx_;
     int32_t length;
-    scoped_ptr<const char> descriptor(raw->CreateMethodDescriptor(proto_idx,
-                                                                  &length));
+    scoped_array<const char> descriptor(raw->CreateMethodDescriptor(proto_idx,
+        &length));
     ASSERT_STREQ("(IDJLjava/lang/Object;)Ljava/lang/Float;", descriptor.get());
   }
 
@@ -113,8 +113,8 @@
 
     uint32_t proto_idx = method_id.proto_idx_;
     int32_t length;
-    scoped_ptr<const char> descriptor(raw->CreateMethodDescriptor(proto_idx,
-                                                                  &length));
+    scoped_array<const char> descriptor(raw->CreateMethodDescriptor(proto_idx,
+        &length));
     ASSERT_STREQ("(ZSC)LCreateMethodDescriptor;", descriptor.get());
   }