commit b095f022a9683a9123018c01e22595cf969fd88b
author David Sehr <sehr@google.com> Fri Jun 22 14:38:51 2018 -0700
committer David Sehr <sehr@google.com> Wed Jun 27 18:14:50 2018 -0700
tree ccbf6e69ca17f4677186f4e148e1f9baf8bc7ae4
parent b5271dd44a30f498689e503340d3c8d01bf31f07

Refactor DexFile ownership

Avoid bare pointers in DexFileLoader APIs, which caused clang-tidy
issues and other problems.

Bug: none
Test: build and boot
Change-Id: Ic277bc83af1997774b42c55d3d631ec940b9c015

runtime/class_linker_test.cc

diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index e40f1db..2a2aff1 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -1521,12 +1521,12 @@
   dex_cache->SetLocation(location.Get());
   const DexFile* old_dex_file = dex_cache->GetDexFile();
 
-  std::unique_ptr<DexFile> dex_file(new StandardDexFile(old_dex_file->Begin(),
-                                                        old_dex_file->Size(),
-                                                        location->ToModifiedUtf8(),
-                                                        0u,
-                                                        nullptr,
-                                                        nullptr));
+  std::unique_ptr<DexFile> dex_file(
+      new StandardDexFile(std::make_unique<NonOwningDexFileContainer>(old_dex_file->Begin(),
+                                                                      old_dex_file->Size()),
+                          location->ToModifiedUtf8(),
+                          0u,
+                          nullptr));
   {
     WriterMutexLock mu(soa.Self(), *Locks::dex_lock_);
     // Check that inserting with a UTF16 name works.