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

Side by Side Diff: chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "base/values.h" 6 #include "base/values.h"
7 #include "chrome/browser/sync/test/integration/preferences_helper.h" 7 #include "chrome/browser/sync/test/integration/preferences_helper.h"
8 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 10
11 using preferences_helper::ChangeListPref; 11 using preferences_helper::ChangeListPref;
12 using preferences_helper::AwaitListPrefMatches; 12 using preferences_helper::AwaitListPrefMatches;
13 13
14 class MultipleClientPreferencesSyncTest : public SyncTest { 14 class MultipleClientPreferencesSyncTest : public SyncTest {
15 public: 15 public:
16 MultipleClientPreferencesSyncTest() : SyncTest(MULTIPLE_CLIENT) {} 16 MultipleClientPreferencesSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
17 virtual ~MultipleClientPreferencesSyncTest() {} 17 virtual ~MultipleClientPreferencesSyncTest() {}
18 18
19 virtual bool TestUsesSelfNotifications() OVERRIDE { 19 virtual bool TestUsesSelfNotifications() override {
20 return false; 20 return false;
21 } 21 }
22 22
23 private: 23 private:
24 DISALLOW_COPY_AND_ASSIGN(MultipleClientPreferencesSyncTest); 24 DISALLOW_COPY_AND_ASSIGN(MultipleClientPreferencesSyncTest);
25 }; 25 };
26 26
27 IN_PROC_BROWSER_TEST_F(MultipleClientPreferencesSyncTest, Sanity) { 27 IN_PROC_BROWSER_TEST_F(MultipleClientPreferencesSyncTest, Sanity) {
28 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 28 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
29 DisableVerifier(); 29 DisableVerifier();
30 30
31 for (int i = 0; i < num_clients(); ++i) { 31 for (int i = 0; i < num_clients(); ++i) {
32 base::ListValue urls; 32 base::ListValue urls;
33 urls.Append(new base::StringValue( 33 urls.Append(new base::StringValue(
34 base::StringPrintf("http://www.google.com/%d", i))); 34 base::StringPrintf("http://www.google.com/%d", i)));
35 ChangeListPref(i, prefs::kURLsToRestoreOnStartup, urls); 35 ChangeListPref(i, prefs::kURLsToRestoreOnStartup, urls);
36 } 36 }
37 37
38 ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup)); 38 ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup));
39 } 39 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698