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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_dictionary_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/string_number_conversions.h" 5 #include "base/strings/string_number_conversions.h"
6 #include "chrome/browser/sync/test/integration/dictionary_helper.h" 6 #include "chrome/browser/sync/test/integration/dictionary_helper.h"
7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
9 #include "chrome/browser/sync/test/integration/sync_test.h" 9 #include "chrome/browser/sync/test/integration/sync_test.h"
10 #include "chrome/common/spellcheck_common.h" 10 #include "chrome/common/spellcheck_common.h"
11 11
12 using sync_integration_test_util::AwaitCommitActivityCompletion; 12 using sync_integration_test_util::AwaitCommitActivityCompletion;
13 13
14 class TwoClientDictionarySyncTest : public SyncTest { 14 class TwoClientDictionarySyncTest : public SyncTest {
15 public: 15 public:
16 TwoClientDictionarySyncTest() : SyncTest(TWO_CLIENT) {} 16 TwoClientDictionarySyncTest() : SyncTest(TWO_CLIENT) {}
17 virtual ~TwoClientDictionarySyncTest() {} 17 virtual ~TwoClientDictionarySyncTest() {}
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(TwoClientDictionarySyncTest); 24 DISALLOW_COPY_AND_ASSIGN(TwoClientDictionarySyncTest);
25 }; 25 };
26 26
27 IN_PROC_BROWSER_TEST_F(TwoClientDictionarySyncTest, Sanity) { 27 IN_PROC_BROWSER_TEST_F(TwoClientDictionarySyncTest, Sanity) {
28 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 28 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
29 dictionary_helper::LoadDictionaries(); 29 dictionary_helper::LoadDictionaries();
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 91 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
92 // Remove on client A, check it disappears on B. 92 // Remove on client A, check it disappears on B.
93 ASSERT_TRUE(dictionary_helper::RemoveWord(0, word)); 93 ASSERT_TRUE(dictionary_helper::RemoveWord(0, word));
94 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 94 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
95 // Add on client B, check it appears on A. 95 // Add on client B, check it appears on A.
96 ASSERT_TRUE(dictionary_helper::AddWord(1, word)); 96 ASSERT_TRUE(dictionary_helper::AddWord(1, word));
97 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 97 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
98 ASSERT_EQ(1UL, dictionary_helper::GetDictionarySize(0)); 98 ASSERT_EQ(1UL, dictionary_helper::GetDictionarySize(0));
99 } 99 }
100 100
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698