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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_file_system/drive_backend/remote_to_local_syncer.h " 5 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h "
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } // namespace 45 } // namespace
46 46
47 class RemoteToLocalSyncerTest : public testing::Test { 47 class RemoteToLocalSyncerTest : public testing::Test {
48 public: 48 public:
49 typedef FakeRemoteChangeProcessor::URLToFileChangesMap URLToFileChangesMap; 49 typedef FakeRemoteChangeProcessor::URLToFileChangesMap URLToFileChangesMap;
50 50
51 RemoteToLocalSyncerTest() 51 RemoteToLocalSyncerTest()
52 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} 52 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
53 virtual ~RemoteToLocalSyncerTest() {} 53 virtual ~RemoteToLocalSyncerTest() {}
54 54
55 virtual void SetUp() OVERRIDE { 55 virtual void SetUp() override {
56 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); 56 ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
57 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); 57 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
58 58
59 scoped_ptr<drive::FakeDriveService> 59 scoped_ptr<drive::FakeDriveService>
60 fake_drive_service(new drive::FakeDriveService); 60 fake_drive_service(new drive::FakeDriveService);
61 61
62 scoped_ptr<drive::DriveUploaderInterface> 62 scoped_ptr<drive::DriveUploaderInterface>
63 drive_uploader(new drive::DriveUploader( 63 drive_uploader(new drive::DriveUploader(
64 fake_drive_service.get(), 64 fake_drive_service.get(),
65 base::ThreadTaskRunnerHandle::Get().get())); 65 base::ThreadTaskRunnerHandle::Get().get()));
(...skipping 13 matching lines...) Expand all
79 79
80 RegisterSyncableFileSystem(); 80 RegisterSyncableFileSystem();
81 81
82 sync_task_manager_.reset(new SyncTaskManager( 82 sync_task_manager_.reset(new SyncTaskManager(
83 base::WeakPtr<SyncTaskManager::Client>(), 83 base::WeakPtr<SyncTaskManager::Client>(),
84 10 /* max_parallel_task */, 84 10 /* max_parallel_task */,
85 base::ThreadTaskRunnerHandle::Get())); 85 base::ThreadTaskRunnerHandle::Get()));
86 sync_task_manager_->Initialize(SYNC_STATUS_OK); 86 sync_task_manager_->Initialize(SYNC_STATUS_OK);
87 } 87 }
88 88
89 virtual void TearDown() OVERRIDE { 89 virtual void TearDown() override {
90 sync_task_manager_.reset(); 90 sync_task_manager_.reset();
91 RevokeSyncableFileSystem(); 91 RevokeSyncableFileSystem();
92 fake_drive_helper_.reset(); 92 fake_drive_helper_.reset();
93 context_.reset(); 93 context_.reset();
94 base::RunLoop().RunUntilIdle(); 94 base::RunLoop().RunUntilIdle();
95 } 95 }
96 96
97 void InitializeMetadataDatabase() { 97 void InitializeMetadataDatabase() {
98 SyncEngineInitializer* initializer = 98 SyncEngineInitializer* initializer =
99 new SyncEngineInitializer(context_.get(), 99 new SyncEngineInitializer(context_.get(),
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 492
493 EXPECT_EQ(SYNC_STATUS_OK, ListChanges()); 493 EXPECT_EQ(SYNC_STATUS_OK, ListChanges());
494 EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, RunSyncerUntilIdle()); 494 EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, RunSyncerUntilIdle());
495 VerifyConsistency(); 495 VerifyConsistency();
496 496
497 // SyncEngine will re-register the app and resurrect the app root later. 497 // SyncEngine will re-register the app and resurrect the app root later.
498 } 498 }
499 499
500 } // namespace drive_backend 500 } // namespace drive_backend
501 } // namespace sync_file_system 501 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698