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

Side by Side Diff: chrome/browser/sync/test/integration/enable_disable_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 "chrome/browser/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
7 #include "chrome/browser/sync/test/integration/sync_test.h" 7 #include "chrome/browser/sync/test/integration/sync_test.h"
8 #include "sync/internal_api/public/base/model_type.h" 8 #include "sync/internal_api/public/base/model_type.h"
9 #include "sync/internal_api/public/read_node.h" 9 #include "sync/internal_api/public/read_node.h"
10 #include "sync/internal_api/public/read_transaction.h" 10 #include "sync/internal_api/public/read_transaction.h"
11 11
12 // This file contains tests that exercise enabling and disabling data 12 // This file contains tests that exercise enabling and disabling data
13 // types. 13 // types.
14 14
15 namespace { 15 namespace {
16 16
17 class EnableDisableSingleClientTest : public SyncTest { 17 class EnableDisableSingleClientTest : public SyncTest {
18 public: 18 public:
19 EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT) {} 19 EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT) {}
20 virtual ~EnableDisableSingleClientTest() {} 20 virtual ~EnableDisableSingleClientTest() {}
21 21
22 // Don't use self-notifications as they can trigger additional sync cycles. 22 // Don't use self-notifications as they can trigger additional sync cycles.
23 virtual bool TestUsesSelfNotifications() OVERRIDE { return false; } 23 virtual bool TestUsesSelfNotifications() override { return false; }
24 private: 24 private:
25 DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest); 25 DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
26 }; 26 };
27 27
28 bool DoesTopLevelNodeExist(syncer::UserShare* user_share, 28 bool DoesTopLevelNodeExist(syncer::UserShare* user_share,
29 syncer::ModelType type) { 29 syncer::ModelType type) {
30 syncer::ReadTransaction trans(FROM_HERE, user_share); 30 syncer::ReadTransaction trans(FROM_HERE, user_share);
31 syncer::ReadNode node(&trans); 31 syncer::ReadNode node(&trans);
32 return node.InitTypeRoot(type) == syncer::BaseNode::INIT_OK; 32 return node.InitTypeRoot(type) == syncer::BaseNode::INIT_OK;
33 } 33 }
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS), 148 ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS),
149 DoesTopLevelNodeExist(user_share, syncer::SESSIONS)); 149 DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
150 } else if (it.Get() == syncer::PREFERENCES) { 150 } else if (it.Get() == syncer::PREFERENCES) {
151 ASSERT_FALSE(DoesTopLevelNodeExist(user_share, 151 ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
152 syncer::PRIORITY_PREFERENCES)); 152 syncer::PRIORITY_PREFERENCES));
153 } 153 }
154 } 154 }
155 } 155 }
156 156
157 } // namespace 157 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698