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

Side by Side Diff: sync/internal_api/sync_rollback_manager_unittest.cc

Issue 1104543005: Update {virtual,override} to follow C++11 style in sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « sync/internal_api/sync_manager_impl_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "sync/internal_api/sync_rollback_manager.h" 5 #include "sync/internal_api/sync_rollback_manager.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.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"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 EXPECT_TRUE(expected_deletes_ == deleted); 62 EXPECT_TRUE(expected_deletes_ == deleted);
63 } 63 }
64 64
65 std::set<int64> expected_deletes_; 65 std::set<int64> expected_deletes_;
66 }; 66 };
67 67
68 class SyncRollbackManagerTest : public testing::Test, 68 class SyncRollbackManagerTest : public testing::Test,
69 public SyncManager::Observer { 69 public SyncManager::Observer {
70 protected: 70 protected:
71 virtual void SetUp() override { 71 void SetUp() override {
72 CHECK(temp_dir_.CreateUniqueTempDir()); 72 CHECK(temp_dir_.CreateUniqueTempDir());
73 73
74 worker_ = new FakeModelWorker(GROUP_UI); 74 worker_ = new FakeModelWorker(GROUP_UI);
75 } 75 }
76 76
77 MOCK_METHOD1(OnSyncCycleCompleted, 77 MOCK_METHOD1(OnSyncCycleCompleted,
78 void(const sessions::SyncSessionSnapshot&)); 78 void(const sessions::SyncSessionSnapshot&));
79 MOCK_METHOD1(OnConnectionStatusChange, void(ConnectionStatus)); 79 MOCK_METHOD1(OnConnectionStatusChange, void(ConnectionStatus));
80 MOCK_METHOD4(OnInitializationComplete, 80 MOCK_METHOD4(OnInitializationComplete,
81 void(const WeakHandle<JsBackend>&, 81 void(const WeakHandle<JsBackend>&,
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // Test graceful shutdown on initialization failure. 259 // Test graceful shutdown on initialization failure.
260 scoped_ptr<SyncRollbackManager> rollback_manager( 260 scoped_ptr<SyncRollbackManager> rollback_manager(
261 new SyncRollbackManager); 261 new SyncRollbackManager);
262 InitManager(rollback_manager.get(), ModelTypeSet(PREFERENCES), NULL, 262 InitManager(rollback_manager.get(), ModelTypeSet(PREFERENCES), NULL,
263 InternalComponentsFactory::STORAGE_ON_DISK); 263 InternalComponentsFactory::STORAGE_ON_DISK);
264 } 264 }
265 265
266 } // anonymous namespace 266 } // anonymous namespace
267 267
268 } // namespace syncer 268 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/sync_manager_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698