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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_passwords_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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/sync/test/integration/passwords_helper.h" 6 #include "chrome/browser/sync/test/integration/passwords_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 "sync/internal_api/public/engine/model_safe_worker.h" 10 #include "sync/internal_api/public/engine/model_safe_worker.h"
(...skipping 19 matching lines...) Expand all
30 30
31 using autofill::PasswordForm; 31 using autofill::PasswordForm;
32 32
33 static const char* kValidPassphrase = "passphrase!"; 33 static const char* kValidPassphrase = "passphrase!";
34 34
35 class TwoClientPasswordsSyncTest : public SyncTest { 35 class TwoClientPasswordsSyncTest : public SyncTest {
36 public: 36 public:
37 TwoClientPasswordsSyncTest() : SyncTest(TWO_CLIENT) {} 37 TwoClientPasswordsSyncTest() : SyncTest(TWO_CLIENT) {}
38 virtual ~TwoClientPasswordsSyncTest() {} 38 virtual ~TwoClientPasswordsSyncTest() {}
39 39
40 virtual bool TestUsesSelfNotifications() OVERRIDE { return false; } 40 virtual bool TestUsesSelfNotifications() override { return false; }
41 41
42 private: 42 private:
43 DISALLOW_COPY_AND_ASSIGN(TwoClientPasswordsSyncTest); 43 DISALLOW_COPY_AND_ASSIGN(TwoClientPasswordsSyncTest);
44 }; 44 };
45 45
46 class LegacyTwoClientPasswordsSyncTest : public SyncTest { 46 class LegacyTwoClientPasswordsSyncTest : public SyncTest {
47 public: 47 public:
48 LegacyTwoClientPasswordsSyncTest() : SyncTest(TWO_CLIENT_LEGACY) {} 48 LegacyTwoClientPasswordsSyncTest() : SyncTest(TWO_CLIENT_LEGACY) {}
49 virtual ~LegacyTwoClientPasswordsSyncTest() {} 49 virtual ~LegacyTwoClientPasswordsSyncTest() {}
50 50
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 PasswordForm form0 = CreateTestPasswordForm(0); 179 PasswordForm form0 = CreateTestPasswordForm(0);
180 AddLogin(GetPasswordStore(0), form0); 180 AddLogin(GetPasswordStore(0), form0);
181 PasswordForm form1 = CreateTestPasswordForm(1); 181 PasswordForm form1 = CreateTestPasswordForm(1);
182 AddLogin(GetPasswordStore(1), form1); 182 AddLogin(GetPasswordStore(1), form1);
183 PasswordForm form2 = CreateTestPasswordForm(2); 183 PasswordForm form2 = CreateTestPasswordForm(2);
184 AddLogin(GetPasswordStore(1), form2); 184 AddLogin(GetPasswordStore(1), form2);
185 185
186 ASSERT_TRUE(AwaitAllProfilesContainSamePasswordForms()); 186 ASSERT_TRUE(AwaitAllProfilesContainSamePasswordForms());
187 ASSERT_EQ(3, GetPasswordCount(0)); 187 ASSERT_EQ(3, GetPasswordCount(0));
188 } 188 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698