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

components/signin/core/browser/account_tracker_service.cc

 // Copyright 2014 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 "components/signin/core/browser/account_tracker_service.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 332 matching lines @@
         if (dict->GetString(kAccountPictureURLPath, &value))
           state.info.picture_url = base::UTF16ToUTF8(value);
 
         bool is_child_account = false;
         // Migrate deprecated service flag preference.
         const base::ListValue* service_flags_list;
         if (dict->GetList(kAccountServiceFlagsPath, &service_flags_list)) {
           contains_deprecated_service_flags = true;
           std::string flag_string;
           for (const auto& flag : *service_flags_list) {
-            if (flag->GetAsString(&flag_string) &&
+            if (flag.GetAsString(&flag_string) &&
                 flag_string == kChildAccountServiceFlag) {
               is_child_account = true;
               break;
             }
           }
           state.info.is_child_account = is_child_account;
         }
         if (dict->GetBoolean(kAccountChildAccountStatusPath, &is_child_account))
           state.info.is_child_account = is_child_account;
 
@@ skipping 36 matching lines @@
     if (update->GetDictionary(i, &dict)) {
       base::string16 value;
       if (dict->GetString(kAccountKeyPath, &value) && value == account_id_16)
         break;
     }
   }
 
   if (!dict) {
     dict = new base::DictionaryValue();
     update->Append(base::WrapUnique(dict));
+    // |dict| is invalidated at this point, so it needs to be reset.
+    update->GetDictionary(update->GetSize() - 1, &dict);
     dict->SetString(kAccountKeyPath, account_id_16);
   }
 
   dict->SetString(kAccountEmailPath, state.info.email);
   dict->SetString(kAccountGaiaPath, state.info.gaia);
   dict->SetString(kAccountHostedDomainPath, state.info.hosted_domain);
   dict->SetString(kAccountFullNamePath, state.info.full_name);
   dict->SetString(kAccountGivenNamePath, state.info.given_name);
   dict->SetString(kAccountLocalePath, state.info.locale);
   dict->SetString(kAccountPictureURLPath, state.info.picture_url);
@@ skipping 80 matching lines @@
       NotifyAccountUpdated(state);
 
     SaveToPrefs(state);
   }
   return info.account_id;
 }
 
 void AccountTrackerService::RemoveAccount(const std::string& account_id) {
   StopTrackingAccount(account_id);
 }