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

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

Issue 686563003: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/prefs/pref_member.h" 5 #include "base/prefs/pref_member.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/sync/profile_sync_service.h" 8 #include "chrome/browser/sync/profile_sync_service.h"
9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
10 #include "chrome/browser/sync/test/integration/passwords_helper.h" 10 #include "chrome/browser/sync/test/integration/passwords_helper.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 bool AwaitTypeDisabled(ProfileSyncService* service, 59 bool AwaitTypeDisabled(ProfileSyncService* service,
60 syncer::ModelType type) { 60 syncer::ModelType type) {
61 TypeDisabledChecker checker(service, type); 61 TypeDisabledChecker checker(service, type);
62 checker.Wait(); 62 checker.Wait();
63 return !checker.TimedOut(); 63 return !checker.TimedOut();
64 } 64 }
65 65
66 class SyncErrorTest : public SyncTest { 66 class SyncErrorTest : public SyncTest {
67 public: 67 public:
68 SyncErrorTest() : SyncTest(SINGLE_CLIENT) {} 68 SyncErrorTest() : SyncTest(SINGLE_CLIENT) {}
69 virtual ~SyncErrorTest() {} 69 ~SyncErrorTest() override {}
70 70
71 private: 71 private:
72 DISALLOW_COPY_AND_ASSIGN(SyncErrorTest); 72 DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
73 }; 73 };
74 74
75 // Helper class that waits until the sync engine has hit an actionable error. 75 // Helper class that waits until the sync engine has hit an actionable error.
76 class ActionableErrorChecker : public SingleClientStatusChangeChecker { 76 class ActionableErrorChecker : public SingleClientStatusChangeChecker {
77 public: 77 public:
78 explicit ActionableErrorChecker(ProfileSyncService* service) 78 explicit ActionableErrorChecker(ProfileSyncService* service)
79 : SingleClientStatusChangeChecker(service) {} 79 : SingleClientStatusChangeChecker(service) {}
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS)); 221 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS));
222 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS)); 222 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS));
223 223
224 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); 224 const BookmarkNode* node1 = AddFolder(0, 0, "title1");
225 SetTitle(0, node1, "new_title1"); 225 SetTitle(0, node1, "new_title1");
226 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 226 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
227 // TODO(lipalani)" Verify initial sync ended for typed url is false. 227 // TODO(lipalani)" Verify initial sync ended for typed url is false.
228 } 228 }
229 229
230 } // namespace 230 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698