Revert of Change base::Value::ListStorage to std::vector<base::Value>

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
@@ skipping 662 matching lines @@
 
   std::vector<Profile*> to_return;
   if (local_state->HasPrefPath(prefs::kProfilesLastActive) &&
       local_state->GetList(prefs::kProfilesLastActive)) {
     // Make a copy because the list might change in the calls to GetProfile.
     std::unique_ptr<base::ListValue> profile_list(
         local_state->GetList(prefs::kProfilesLastActive)->DeepCopy());
     base::ListValue::const_iterator it;
     for (it = profile_list->begin(); it != profile_list->end(); ++it) {
       std::string profile_path;
-      if (!it->GetAsString(&profile_path) || profile_path.empty() ||
+      if (!(*it)->GetAsString(&profile_path) ||
+          profile_path.empty() ||
           profile_path ==
               base::FilePath(chrome::kSystemProfileDir).AsUTF8Unsafe()) {
         LOG(WARNING) << "Invalid entry in " << prefs::kProfilesLastActive;
         continue;
       }
       Profile* profile = GetProfile(user_data_dir.AppendASCII(profile_path));
       if (profile)
         to_return.push_back(profile);
     }
   }
@@ skipping 201 matching lines @@
   }
 }
 
 void ProfileManager::CleanUpDeletedProfiles() {
   PrefService* local_state = g_browser_process->local_state();
   DCHECK(local_state);
   const base::ListValue* deleted_profiles =
       local_state->GetList(prefs::kProfilesDeleted);
   DCHECK(deleted_profiles);
 
-  for (const base::Value& value : *deleted_profiles) {
+  for (const std::unique_ptr<base::Value>& value : *deleted_profiles) {
     base::FilePath profile_path;
     bool is_valid_profile_path =
-        base::GetValueAsFilePath(value, &profile_path) &&
+        base::GetValueAsFilePath(*value, &profile_path) &&
         profile_path.DirName() == user_data_dir();
     // Although it should never happen, make sure this is a valid path in the
     // user_data_dir, so we don't accidentially delete something else.
     if (is_valid_profile_path) {
       if (base::PathExists(profile_path)) {
         LOG(WARNING) << "Files of a deleted profile still exist after restart. "
                         "Cleaning up now.";
         BrowserThread::PostTaskAndReply(
             BrowserThread::FILE, FROM_HERE,
             base::Bind(&NukeProfileFromDisk, profile_path),
-            base::Bind(&ProfileCleanedUp, &value));
+            base::Bind(&ProfileCleanedUp, value.get()));
       } else {
         // Everything is fine, the profile was removed on shutdown.
-        BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                                base::Bind(&ProfileCleanedUp, &value));
+        BrowserThread::PostTask(
+          BrowserThread::UI, FROM_HERE,
+          base::Bind(&ProfileCleanedUp, value.get()));
       }
     } else {
       LOG(ERROR) << "Found invalid profile path in deleted_profiles: "
                  << profile_path.AsUTF8Unsafe();
       NOTREACHED();
     }
   }
 }
 
 void ProfileManager::InitProfileUserPrefs(Profile* profile) {
@@ skipping 860 matching lines @@
 
   const base::FilePath new_active_profile_dir =
       found_entry ? found_entry->GetPath() : GenerateNextProfileDirectoryPath();
   FinishDeletingProfile(profile_dir, new_active_profile_dir);
 }
 #endif  // !defined(OS_ANDROID)
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }