summaryrefslogtreecommitdiff
path: root/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-02-21 12:16:55 +0000
committerTorne (Richard Coles) <torne@google.com>2014-02-21 12:16:55 +0000
commit5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch)
tree5d4ae202b870bd86673f596f0d424bc4b3e55ebe /chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
parente862bac9c33104a29d98631d62668ae7b6676510 (diff)
downloadchromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py. Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc')
-rw-r--r--chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
index 601a5141db..735f65d367 100644
--- a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
@@ -25,8 +25,8 @@ IN_PROC_BROWSER_TEST_F(MultipleClientPreferencesSyncTest, Sanity) {
DisableVerifier();
for (int i = 0; i < num_clients(); ++i) {
- ListValue urls;
- urls.Append(Value::CreateStringValue(
+ base::ListValue urls;
+ urls.Append(base::Value::CreateStringValue(
base::StringPrintf("http://www.google.com/%d", i)));
ChangeListPref(i, prefs::kURLsToRestoreOnStartup, urls);
}