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

Side by Side Diff: chrome/browser/sync/test/integration/multiple_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_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 #include "chrome/common/spellcheck_common.h" 9 #include "chrome/common/spellcheck_common.h"
10 10
11 using dictionary_helper::AwaitNumDictionaryEntries; 11 using dictionary_helper::AwaitNumDictionaryEntries;
12 using chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS; 12 using chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
13 13
14 class MultipleClientDictionarySyncTest : public SyncTest { 14 class MultipleClientDictionarySyncTest : public SyncTest {
15 public: 15 public:
16 MultipleClientDictionarySyncTest() : SyncTest(MULTIPLE_CLIENT) {} 16 MultipleClientDictionarySyncTest() : SyncTest(MULTIPLE_CLIENT) {}
17 virtual ~MultipleClientDictionarySyncTest() {} 17 virtual ~MultipleClientDictionarySyncTest() {}
18 18
19 virtual bool TestUsesSelfNotifications() OVERRIDE { return false; } 19 virtual bool TestUsesSelfNotifications() override { return false; }
20 20
21 private: 21 private:
22 DISALLOW_COPY_AND_ASSIGN(MultipleClientDictionarySyncTest); 22 DISALLOW_COPY_AND_ASSIGN(MultipleClientDictionarySyncTest);
23 }; 23 };
24 24
25 IN_PROC_BROWSER_TEST_F(MultipleClientDictionarySyncTest, AddToOne) { 25 IN_PROC_BROWSER_TEST_F(MultipleClientDictionarySyncTest, AddToOne) {
26 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 26 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
27 dictionary_helper::LoadDictionaries(); 27 dictionary_helper::LoadDictionaries();
28 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 28 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
29 29
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // the server. It will commit some of the entries it had locally. And it 115 // the server. It will commit some of the entries it had locally. And it
116 // will have a few uncommittable items left over. 116 // will have a few uncommittable items left over.
117 ASSERT_TRUE(AwaitNumDictionaryEntries(n-1, initial_words*n)); 117 ASSERT_TRUE(AwaitNumDictionaryEntries(n-1, initial_words*n));
118 118
119 // Everyone else should be at the limit. 119 // Everyone else should be at the limit.
120 for (int i = 0; i < n-1; ++i) { 120 for (int i = 0; i < n-1; ++i) {
121 SCOPED_TRACE(i); 121 SCOPED_TRACE(i);
122 ASSERT_TRUE(AwaitNumDictionaryEntries(i, MAX_SYNCABLE_DICTIONARY_WORDS)); 122 ASSERT_TRUE(AwaitNumDictionaryEntries(i, MAX_SYNCABLE_DICTIONARY_WORDS));
123 } 123 }
124 } 124 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698