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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/local_to_remote_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/local_to_remote_syncer.h " 5 #include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h "
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 const int kRetryLimit = 100; 48 const int kRetryLimit = 100;
49 49
50 } // namespace 50 } // namespace
51 51
52 class LocalToRemoteSyncerTest : public testing::Test { 52 class LocalToRemoteSyncerTest : public testing::Test {
53 public: 53 public:
54 LocalToRemoteSyncerTest() 54 LocalToRemoteSyncerTest()
55 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {} 55 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
56 virtual ~LocalToRemoteSyncerTest() {} 56 virtual ~LocalToRemoteSyncerTest() {}
57 57
58 virtual void SetUp() OVERRIDE { 58 virtual void SetUp() override {
59 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); 59 ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
60 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); 60 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
61 61
62 scoped_ptr<FakeDriveServiceWrapper> 62 scoped_ptr<FakeDriveServiceWrapper>
63 fake_drive_service(new FakeDriveServiceWrapper); 63 fake_drive_service(new FakeDriveServiceWrapper);
64 scoped_ptr<drive::DriveUploaderInterface> 64 scoped_ptr<drive::DriveUploaderInterface>
65 drive_uploader(new FakeDriveUploader(fake_drive_service.get())); 65 drive_uploader(new FakeDriveUploader(fake_drive_service.get()));
66 fake_drive_helper_.reset(new FakeDriveServiceHelper( 66 fake_drive_helper_.reset(new FakeDriveServiceHelper(
67 fake_drive_service.get(), 67 fake_drive_service.get(),
68 drive_uploader.get(), 68 drive_uploader.get(),
(...skipping 10 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 /* maximum_background_task */, 84 10 /* maximum_background_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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 EXPECT_EQ(SYNC_STATUS_UNKNOWN_ORIGIN, RunLocalToRemoteSyncer( 538 EXPECT_EQ(SYNC_STATUS_UNKNOWN_ORIGIN, RunLocalToRemoteSyncer(
539 FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, 539 FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
540 SYNC_FILE_TYPE_DIRECTORY), 540 SYNC_FILE_TYPE_DIRECTORY),
541 URL(kOrigin, "foo"))); 541 URL(kOrigin, "foo")));
542 542
543 // SyncEngine will re-register the app and resurrect the app root later. 543 // SyncEngine will re-register the app and resurrect the app root later.
544 } 544 }
545 545
546 } // namespace drive_backend 546 } // namespace drive_backend
547 } // namespace sync_file_system 547 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698