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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc

Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 "chrome/browser/sync_file_system/drive_backend/sync_worker.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 public base::SupportsWeakPtr<SyncWorkerTest> { 102 public base::SupportsWeakPtr<SyncWorkerTest> {
103 public: 103 public:
104 SyncWorkerTest() {} 104 SyncWorkerTest() {}
105 ~SyncWorkerTest() override {} 105 ~SyncWorkerTest() override {}
106 106
107 void SetUp() override { 107 void SetUp() override {
108 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); 108 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
109 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); 109 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
110 110
111 extension_service_.reset(new MockExtensionService); 111 extension_service_.reset(new MockExtensionService);
112 scoped_ptr<drive::DriveServiceInterface> 112 std::unique_ptr<drive::DriveServiceInterface> fake_drive_service(
113 fake_drive_service(new drive::FakeDriveService); 113 new drive::FakeDriveService);
114 114
115 scoped_ptr<SyncEngineContext> sync_engine_context(new SyncEngineContext( 115 std::unique_ptr<SyncEngineContext> sync_engine_context(
116 std::move(fake_drive_service), nullptr /* drive_uploader */, 116 new SyncEngineContext(
117 nullptr /* task_logger */, 117 std::move(fake_drive_service), nullptr /* drive_uploader */,
118 base::ThreadTaskRunnerHandle::Get() /* ui_task_runner */, 118 nullptr /* task_logger */,
119 base::ThreadTaskRunnerHandle::Get() /* worker_task_runner */, 119 base::ThreadTaskRunnerHandle::Get() /* ui_task_runner */,
120 nullptr /* worker_pool */)); 120 base::ThreadTaskRunnerHandle::Get() /* worker_task_runner */,
121 nullptr /* worker_pool */));
121 122
122 sync_worker_.reset(new SyncWorker( 123 sync_worker_.reset(new SyncWorker(
123 profile_dir_.path(), 124 profile_dir_.path(),
124 extension_service_->AsWeakPtr(), 125 extension_service_->AsWeakPtr(),
125 in_memory_env_.get())); 126 in_memory_env_.get()));
126 sync_worker_->Initialize(std::move(sync_engine_context)); 127 sync_worker_->Initialize(std::move(sync_engine_context));
127 128
128 sync_worker_->SetSyncEnabled(true); 129 sync_worker_->SetSyncEnabled(true);
129 base::RunLoop().RunUntilIdle(); 130 base::RunLoop().RunUntilIdle();
130 } 131 }
(...skipping 22 matching lines...) Expand all
153 EXPECT_EQ(expected_service_status, sync_worker_->GetCurrentState()); 154 EXPECT_EQ(expected_service_status, sync_worker_->GetCurrentState());
154 } 155 }
155 156
156 MetadataDatabase* metadata_database() { 157 MetadataDatabase* metadata_database() {
157 return sync_worker_->GetMetadataDatabase(); 158 return sync_worker_->GetMetadataDatabase();
158 } 159 }
159 160
160 private: 161 private:
161 content::TestBrowserThreadBundle browser_threads_; 162 content::TestBrowserThreadBundle browser_threads_;
162 base::ScopedTempDir profile_dir_; 163 base::ScopedTempDir profile_dir_;
163 scoped_ptr<leveldb::Env> in_memory_env_; 164 std::unique_ptr<leveldb::Env> in_memory_env_;
164 165
165 scoped_ptr<MockExtensionService> extension_service_; 166 std::unique_ptr<MockExtensionService> extension_service_;
166 scoped_ptr<SyncWorker> sync_worker_; 167 std::unique_ptr<SyncWorker> sync_worker_;
167 168
168 DISALLOW_COPY_AND_ASSIGN(SyncWorkerTest); 169 DISALLOW_COPY_AND_ASSIGN(SyncWorkerTest);
169 }; 170 };
170 171
171 TEST_F(SyncWorkerTest, EnableOrigin) { 172 TEST_F(SyncWorkerTest, EnableOrigin) {
172 FileTracker tracker; 173 FileTracker tracker;
173 SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN; 174 SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN;
174 GURL origin = extensions::Extension::GetBaseURLFromExtensionId(kAppID); 175 GURL origin = extensions::Extension::GetBaseURLFromExtensionId(kAppID);
175 176
176 sync_worker()->RegisterOrigin(origin, CreateResultReceiver(&sync_status)); 177 sync_worker()->RegisterOrigin(origin, CreateResultReceiver(&sync_status));
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 sync_worker()->RegisterOrigin(GURL("chrome-extension://app_0"), 256 sync_worker()->RegisterOrigin(GURL("chrome-extension://app_0"),
256 CreateResultReceiver(&sync_status)); 257 CreateResultReceiver(&sync_status));
257 base::RunLoop().RunUntilIdle(); 258 base::RunLoop().RunUntilIdle();
258 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 259 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
259 260
260 sync_worker()->RegisterOrigin(GURL("chrome-extension://app_1"), 261 sync_worker()->RegisterOrigin(GURL("chrome-extension://app_1"),
261 CreateResultReceiver(&sync_status)); 262 CreateResultReceiver(&sync_status));
262 base::RunLoop().RunUntilIdle(); 263 base::RunLoop().RunUntilIdle();
263 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 264 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
264 265
265 scoped_ptr<RemoteFileSyncService::OriginStatusMap> status_map; 266 std::unique_ptr<RemoteFileSyncService::OriginStatusMap> status_map;
266 sync_worker()->GetOriginStatusMap(CreateResultReceiver(&status_map)); 267 sync_worker()->GetOriginStatusMap(CreateResultReceiver(&status_map));
267 base::RunLoop().RunUntilIdle(); 268 base::RunLoop().RunUntilIdle();
268 ASSERT_EQ(2u, status_map->size()); 269 ASSERT_EQ(2u, status_map->size());
269 EXPECT_EQ("Enabled", (*status_map)[GURL("chrome-extension://app_0")]); 270 EXPECT_EQ("Enabled", (*status_map)[GURL("chrome-extension://app_0")]);
270 EXPECT_EQ("Enabled", (*status_map)[GURL("chrome-extension://app_1")]); 271 EXPECT_EQ("Enabled", (*status_map)[GURL("chrome-extension://app_1")]);
271 272
272 sync_worker()->DisableOrigin(GURL("chrome-extension://app_1"), 273 sync_worker()->DisableOrigin(GURL("chrome-extension://app_1"),
273 CreateResultReceiver(&sync_status)); 274 CreateResultReceiver(&sync_status));
274 base::RunLoop().RunUntilIdle(); 275 base::RunLoop().RunUntilIdle();
275 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 276 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 GetSyncTaskManager()->ScheduleTask( 360 GetSyncTaskManager()->ScheduleTask(
360 FROM_HERE, 361 FROM_HERE,
361 base::Bind(&EmptyTask, SYNC_DATABASE_ERROR_FAILED), 362 base::Bind(&EmptyTask, SYNC_DATABASE_ERROR_FAILED),
362 SyncTaskManager::PRIORITY_MED, 363 SyncTaskManager::PRIORITY_MED,
363 base::Bind(&SyncWorkerTest::CheckServiceState, 364 base::Bind(&SyncWorkerTest::CheckServiceState,
364 AsWeakPtr(), 365 AsWeakPtr(),
365 SYNC_DATABASE_ERROR_FAILED, 366 SYNC_DATABASE_ERROR_FAILED,
366 REMOTE_SERVICE_DISABLED)); 367 REMOTE_SERVICE_DISABLED));
367 368
368 GetSyncTaskManager()->ScheduleSyncTask( 369 GetSyncTaskManager()->ScheduleSyncTask(
369 FROM_HERE, 370 FROM_HERE, std::unique_ptr<SyncTask>(new MockSyncTask(false)),
370 scoped_ptr<SyncTask>(new MockSyncTask(false)),
371 SyncTaskManager::PRIORITY_MED, 371 SyncTaskManager::PRIORITY_MED,
372 base::Bind(&SyncWorkerTest::CheckServiceState, 372 base::Bind(&SyncWorkerTest::CheckServiceState, AsWeakPtr(),
373 AsWeakPtr(), 373 SYNC_STATUS_OK, REMOTE_SERVICE_DISABLED));
374 SYNC_STATUS_OK,
375 REMOTE_SERVICE_DISABLED));
376 374
377 GetSyncTaskManager()->ScheduleSyncTask( 375 GetSyncTaskManager()->ScheduleSyncTask(
378 FROM_HERE, 376 FROM_HERE, std::unique_ptr<SyncTask>(new MockSyncTask(true)),
379 scoped_ptr<SyncTask>(new MockSyncTask(true)),
380 SyncTaskManager::PRIORITY_MED, 377 SyncTaskManager::PRIORITY_MED,
381 base::Bind(&SyncWorkerTest::CheckServiceState, 378 base::Bind(&SyncWorkerTest::CheckServiceState, AsWeakPtr(),
382 AsWeakPtr(), 379 SYNC_STATUS_OK, REMOTE_SERVICE_OK));
383 SYNC_STATUS_OK,
384 REMOTE_SERVICE_OK));
385 380
386 base::RunLoop().RunUntilIdle(); 381 base::RunLoop().RunUntilIdle();
387 } 382 }
388 383
389 } // namespace drive_backend 384 } // namespace drive_backend
390 } // namespace sync_file_system 385 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698