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

Side by Side Diff: sync/sessions/model_type_registry_unittest.cc

Issue 629733002: replace OVERRIDE and FINAL with override and final in sync/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <vector> 5 #include <vector>
6 6
7 #include "base/deferred_sequenced_task_runner.h" 7 #include "base/deferred_sequenced_task_runner.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "sync/engine/model_type_sync_proxy_impl.h" 10 #include "sync/engine/model_type_sync_proxy_impl.h"
11 #include "sync/internal_api/public/base/model_type.h" 11 #include "sync/internal_api/public/base/model_type.h"
12 #include "sync/sessions/model_type_registry.h" 12 #include "sync/sessions/model_type_registry.h"
13 #include "sync/test/engine/fake_model_worker.h" 13 #include "sync/test/engine/fake_model_worker.h"
14 #include "sync/test/engine/mock_nudge_handler.h" 14 #include "sync/test/engine/mock_nudge_handler.h"
15 #include "sync/test/engine/test_directory_setter_upper.h" 15 #include "sync/test/engine/test_directory_setter_upper.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 namespace syncer { 18 namespace syncer {
19 19
20 class ModelTypeRegistryTest : public ::testing::Test { 20 class ModelTypeRegistryTest : public ::testing::Test {
21 public: 21 public:
22 ModelTypeRegistryTest(); 22 ModelTypeRegistryTest();
23 virtual void SetUp() OVERRIDE; 23 virtual void SetUp() override;
24 virtual void TearDown() OVERRIDE; 24 virtual void TearDown() override;
25 25
26 ModelTypeRegistry* registry(); 26 ModelTypeRegistry* registry();
27 27
28 static DataTypeState MakeInitialDataTypeState(ModelType type) { 28 static DataTypeState MakeInitialDataTypeState(ModelType type) {
29 DataTypeState state; 29 DataTypeState state;
30 state.progress_marker.set_data_type_id( 30 state.progress_marker.set_data_type_id(
31 GetSpecificsFieldNumberFromModelType(type)); 31 GetSpecificsFieldNumberFromModelType(type));
32 state.next_client_id = 0; 32 state.next_client_id = 0;
33 return state; 33 return state;
34 } 34 }
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 themes_sync_proxy.reset(); 255 themes_sync_proxy.reset();
256 256
257 // Tear down sessions processing, starting with the type sync proxy. 257 // Tear down sessions processing, starting with the type sync proxy.
258 sessions_sync_proxy.reset(); 258 sessions_sync_proxy.reset();
259 registry()->DisconnectSyncWorker(syncer::SESSIONS); 259 registry()->DisconnectSyncWorker(syncer::SESSIONS);
260 260
261 EXPECT_TRUE(registry()->GetEnabledTypes().Empty()); 261 EXPECT_TRUE(registry()->GetEnabledTypes().Empty());
262 } 262 }
263 263
264 } // namespace syncer 264 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/sessions/model_type_registry.cc ('k') | sync/syncable/deferred_on_disk_directory_backing_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698