Switch //components away from base::ListValue::Append(Value*) overload.

components/signin/core/browser/account_tracker_service_unittest.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 <algorithm>
+#include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/account_tracker_service.h"
@@ skipping 882 matching lines @@
     std::string email_beta = AccountIdToEmail("beta");
     std::string gaia_beta = AccountIdToGaiaId("beta");
 
     pref.registry()->RegisterListPref(AccountTrackerService::kAccountInfoPref);
     pref.registry()->RegisterIntegerPref(
         prefs::kAccountIdMigrationState,
         AccountTrackerService::MIGRATION_NOT_STARTED);
 
     ListPrefUpdate update(&pref, AccountTrackerService::kAccountInfoPref);
 
-    base::DictionaryValue* dict = new base::DictionaryValue();
-    update->Append(dict);
+    std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
     dict->SetString("account_id", base::UTF8ToUTF16(email_alpha));
     dict->SetString("email", base::UTF8ToUTF16(email_alpha));
     dict->SetString("gaia", base::UTF8ToUTF16(gaia_alpha));
+    update->Append(std::move(dict));
 
-    dict = new base::DictionaryValue();
-    update->Append(dict);
+    dict.reset(new base::DictionaryValue());
     dict->SetString("account_id", base::UTF8ToUTF16(email_beta));
     dict->SetString("email", base::UTF8ToUTF16(email_beta));
     dict->SetString("gaia", base::UTF8ToUTF16(gaia_beta));
+    update->Append(std::move(dict));
 
     std::unique_ptr<TestSigninClient> client;
     client.reset(new TestSigninClient(&pref));
     tracker.Initialize(client.get());
 
     ASSERT_EQ(tracker.GetMigrationState(),
               AccountTrackerService::MIGRATION_IN_PROGRESS);
 
     account_info = tracker.GetAccountInfo(gaia_alpha);
     ASSERT_EQ(account_info.account_id, gaia_alpha);
@@ skipping 21 matching lines @@
     std::string gaia_alpha = AccountIdToGaiaId("alpha");
     std::string email_beta = AccountIdToEmail("beta");
 
     pref.registry()->RegisterListPref(AccountTrackerService::kAccountInfoPref);
     pref.registry()->RegisterIntegerPref(
         prefs::kAccountIdMigrationState,
         AccountTrackerService::MIGRATION_NOT_STARTED);
 
     ListPrefUpdate update(&pref, AccountTrackerService::kAccountInfoPref);
 
-    base::DictionaryValue* dict = new base::DictionaryValue();
-    update->Append(dict);

[danakj, 2016/08/26 22:59:24]

this append got lost

[dcheng, 2016/08/26 23:03:38]

Fixed this already in PS3 =)

+    std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
     dict->SetString("account_id", base::UTF8ToUTF16(email_alpha));
     dict->SetString("email", base::UTF8ToUTF16(email_alpha));
     dict->SetString("gaia", base::UTF8ToUTF16(gaia_alpha));
 
-    dict = new base::DictionaryValue();
-    update->Append(dict);
+    dict.reset(new base::DictionaryValue());
     dict->SetString("account_id", base::UTF8ToUTF16(email_beta));
     dict->SetString("email", base::UTF8ToUTF16(email_beta));
     dict->SetString("gaia", base::UTF8ToUTF16(std::string()));
+    update->Append(std::move(dict));
 
     std::unique_ptr<TestSigninClient> client;
     client.reset(new TestSigninClient(&pref));
     tracker.Initialize(client.get());
 
     ASSERT_EQ(tracker.GetMigrationState(),
               AccountTrackerService::MIGRATION_NOT_STARTED);
 
     account_info = tracker.GetAccountInfo(email_alpha);
     ASSERT_EQ(account_info.account_id, email_alpha);
@@ skipping 21 matching lines @@
     std::string email_beta = AccountIdToEmail("beta");
     std::string gaia_beta = AccountIdToGaiaId("beta");
 
     pref.registry()->RegisterListPref(AccountTrackerService::kAccountInfoPref);
     pref.registry()->RegisterIntegerPref(
         prefs::kAccountIdMigrationState,
         AccountTrackerService::MIGRATION_IN_PROGRESS);
 
     ListPrefUpdate update(&pref, AccountTrackerService::kAccountInfoPref);
 
-    base::DictionaryValue* dict = new base::DictionaryValue();
-    update->Append(dict);
+    std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
     dict->SetString("account_id", base::UTF8ToUTF16(email_alpha));
     dict->SetString("email", base::UTF8ToUTF16(email_alpha));
     dict->SetString("gaia", base::UTF8ToUTF16(gaia_alpha));
+    update->Append(std::move(dict));
 
-    dict = new base::DictionaryValue();
-    update->Append(dict);
+    dict.reset(new base::DictionaryValue());
     dict->SetString("account_id", base::UTF8ToUTF16(email_beta));
     dict->SetString("email", base::UTF8ToUTF16(email_beta));
     dict->SetString("gaia", base::UTF8ToUTF16(gaia_beta));
+    update->Append(std::move(dict));
 
     // Succeed miggrated account.
-    dict = new base::DictionaryValue();
-    update->Append(dict);
+    dict.reset(new base::DictionaryValue());
     dict->SetString("account_id", base::UTF8ToUTF16(gaia_alpha));
     dict->SetString("email", base::UTF8ToUTF16(email_alpha));
     dict->SetString("gaia", base::UTF8ToUTF16(gaia_alpha));
+    update->Append(std::move(dict));
 
     std::unique_ptr<TestSigninClient> client;
     client.reset(new TestSigninClient(&pref));
     tracker.Initialize(client.get());
 
     ASSERT_EQ(tracker.GetMigrationState(),
               AccountTrackerService::MIGRATION_IN_PROGRESS);
 
     account_info = tracker.GetAccountInfo(gaia_alpha);
     ASSERT_EQ(account_info.account_id, gaia_alpha);
@@ skipping 167 matching lines @@
   ASSERT_FALSE(info.is_child_account);
   ASSERT_TRUE(observer.CheckEvents(TrackingEvent(UPDATED, child_id)));
 
   SimulateTokenRevoked(child_id);
   ASSERT_TRUE(observer.CheckEvents(TrackingEvent(REMOVED, child_id)));
 
   tracker.RemoveObserver(&observer);
   fetcher.Shutdown();
   tracker.Shutdown();
 }