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

Side by Side Diff: chrome/browser/sync/test/integration/multiple_client_bookmarks_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 "chrome/browser/profiles/profile.h" 6 #include "chrome/browser/profiles/profile.h"
7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
8 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 9
10 using bookmarks_helper::AddURL; 10 using bookmarks_helper::AddURL;
11 using bookmarks_helper::AwaitAllModelsMatch; 11 using bookmarks_helper::AwaitAllModelsMatch;
12 12
13 class MultipleClientBookmarksSyncTest : public SyncTest { 13 class MultipleClientBookmarksSyncTest : public SyncTest {
14 public: 14 public:
15 MultipleClientBookmarksSyncTest() : SyncTest(MULTIPLE_CLIENT) {} 15 MultipleClientBookmarksSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
16 virtual ~MultipleClientBookmarksSyncTest() {} 16 virtual ~MultipleClientBookmarksSyncTest() {}
17 17
18 virtual bool TestUsesSelfNotifications() OVERRIDE { 18 virtual bool TestUsesSelfNotifications() override {
19 return false; 19 return false;
20 } 20 }
21 21
22 private: 22 private:
23 DISALLOW_COPY_AND_ASSIGN(MultipleClientBookmarksSyncTest); 23 DISALLOW_COPY_AND_ASSIGN(MultipleClientBookmarksSyncTest);
24 }; 24 };
25 25
26 IN_PROC_BROWSER_TEST_F(MultipleClientBookmarksSyncTest, Sanity) { 26 IN_PROC_BROWSER_TEST_F(MultipleClientBookmarksSyncTest, Sanity) {
27 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 27 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
28 DisableVerifier(); 28 DisableVerifier();
29 for (int i = 0; i < num_clients(); ++i) { 29 for (int i = 0; i < num_clients(); ++i) {
30 ASSERT_TRUE(AddURL(i, base::StringPrintf("Google URL %d", i), 30 ASSERT_TRUE(AddURL(i, base::StringPrintf("Google URL %d", i),
31 GURL(base::StringPrintf("http://www.google.com/%d", i))) != NULL); 31 GURL(base::StringPrintf("http://www.google.com/%d", i))) != NULL);
32 } 32 }
33 ASSERT_TRUE(AwaitAllModelsMatch()); 33 ASSERT_TRUE(AwaitAllModelsMatch());
34 } 34 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698