Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: chrome/browser/prefs/profile_pref_store_manager_unittest.cc

Issue 2714853002: Remove kDistroDict from Preferences. (Closed)
Patch Set: kRlzPingDelay -> kRlzPingDelaySeconds Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/profile_pref_store_manager_unittest.cc
diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
index 45230ca0d11391be210cecf9bfff67f96303712e..49d38849602f9beb115998d9257b749e3bdcc2d1 100644
--- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <memory>
+#include <utility>
#include <vector>
#include "base/compiler_specific.h"
@@ -319,10 +320,11 @@ TEST_F(ProfilePrefStoreManagerTest, ProtectValues) {
}
TEST_F(ProfilePrefStoreManagerTest, InitializePrefsFromMasterPrefs) {
- base::DictionaryValue master_prefs;
- master_prefs.Set(kTrackedAtomic, new base::StringValue(kFoobar));
- master_prefs.Set(kProtectedAtomic, new base::StringValue(kHelloWorld));
- EXPECT_TRUE(manager_->InitializePrefsFromMasterPrefs(master_prefs));
+ auto master_prefs = base::MakeUnique<base::DictionaryValue>();
+ master_prefs->Set(kTrackedAtomic, new base::StringValue(kFoobar));
+ master_prefs->Set(kProtectedAtomic, new base::StringValue(kHelloWorld));
+ EXPECT_TRUE(
+ manager_->InitializePrefsFromMasterPrefs(std::move(master_prefs)));
LoadExistingPrefs();
« no previous file with comments | « chrome/browser/prefs/profile_pref_store_manager.cc ('k') | chrome/browser/rlz/chrome_rlz_tracker_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698