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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 scoped_refptr<base::SequencedTaskRunner> drive_task_runner = 98 scoped_refptr<base::SequencedTaskRunner> drive_task_runner =
99 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( 99 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
100 worker_pool->GetSequenceToken(), 100 worker_pool->GetSequenceToken(),
101 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); 101 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
102 102
103 RegisterSyncableFileSystem(); 103 RegisterSyncableFileSystem();
104 local_sync_service_ = LocalFileSyncService::CreateForTesting( 104 local_sync_service_ = LocalFileSyncService::CreateForTesting(
105 &profile_, in_memory_env_.get()); 105 &profile_, in_memory_env_.get());
106 local_sync_service_->AddChangeObserver(this); 106 local_sync_service_->AddChangeObserver(this);
107 107
108 scoped_ptr<drive::FakeDriveService> 108 std::unique_ptr<drive::FakeDriveService> drive_service(
109 drive_service(new drive::FakeDriveService); 109 new drive::FakeDriveService);
110 drive_service->Initialize("test@example.com"); 110 drive_service->Initialize("test@example.com");
111 ASSERT_TRUE(drive::test_util::SetUpTestEntries(drive_service.get())); 111 ASSERT_TRUE(drive::test_util::SetUpTestEntries(drive_service.get()));
112 112
113 scoped_ptr<drive::DriveUploaderInterface> uploader( 113 std::unique_ptr<drive::DriveUploaderInterface> uploader(
114 new drive::DriveUploader(drive_service.get(), 114 new drive::DriveUploader(drive_service.get(), file_task_runner_.get()));
115 file_task_runner_.get()));
116 115
117 fake_drive_service_helper_.reset(new FakeDriveServiceHelper( 116 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
118 drive_service.get(), uploader.get(), 117 drive_service.get(), uploader.get(),
119 kSyncRootFolderTitle)); 118 kSyncRootFolderTitle));
120 119
121 remote_sync_service_.reset( 120 remote_sync_service_.reset(
122 new SyncEngine(base::ThreadTaskRunnerHandle::Get(), // ui_task_runner 121 new SyncEngine(base::ThreadTaskRunnerHandle::Get(), // ui_task_runner
123 worker_task_runner_.get(), 122 worker_task_runner_.get(),
124 drive_task_runner.get(), 123 drive_task_runner.get(),
125 worker_pool.get(), 124 worker_pool.get(),
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 SyncStatusCode status = SYNC_STATUS_UNKNOWN; 317 SyncStatusCode status = SYNC_STATUS_UNKNOWN;
319 storage::FileSystemURL url; 318 storage::FileSystemURL url;
320 base::RunLoop run_loop; 319 base::RunLoop run_loop;
321 remote_sync_service_->ProcessRemoteChange(base::Bind( 320 remote_sync_service_->ProcessRemoteChange(base::Bind(
322 &SetSyncStatusAndUrl, run_loop.QuitClosure(), &status, &url)); 321 &SetSyncStatusAndUrl, run_loop.QuitClosure(), &status, &url));
323 run_loop.Run(); 322 run_loop.Run();
324 return status; 323 return status;
325 } 324 }
326 325
327 int64_t GetLargestChangeID() { 326 int64_t GetLargestChangeID() {
328 scoped_ptr<google_apis::AboutResource> about_resource; 327 std::unique_ptr<google_apis::AboutResource> about_resource;
329 EXPECT_EQ(google_apis::HTTP_SUCCESS, 328 EXPECT_EQ(google_apis::HTTP_SUCCESS,
330 fake_drive_service_helper()->GetAboutResource(&about_resource)); 329 fake_drive_service_helper()->GetAboutResource(&about_resource));
331 if (!about_resource) 330 if (!about_resource)
332 return 0; 331 return 0;
333 return about_resource->largest_change_id(); 332 return about_resource->largest_change_id();
334 } 333 }
335 334
336 void FetchRemoteChanges() { 335 void FetchRemoteChanges() {
337 remote_sync_service_->OnNotificationReceived(); 336 remote_sync_service_->OnNotificationReceived();
338 WaitForIdleWorker(); 337 WaitForIdleWorker();
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 616
618 // MetadataDatabase is normally used on the worker thread. 617 // MetadataDatabase is normally used on the worker thread.
619 // Use this only when there is no task running on the worker. 618 // Use this only when there is no task running on the worker.
620 MetadataDatabase* metadata_database() { 619 MetadataDatabase* metadata_database() {
621 return sync_worker()->context_->metadata_database_.get(); 620 return sync_worker()->context_->metadata_database_.get();
622 } 621 }
623 622
624 content::TestBrowserThreadBundle thread_bundle_; 623 content::TestBrowserThreadBundle thread_bundle_;
625 624
626 base::ScopedTempDir base_dir_; 625 base::ScopedTempDir base_dir_;
627 scoped_ptr<leveldb::Env> in_memory_env_; 626 std::unique_ptr<leveldb::Env> in_memory_env_;
628 TestingProfile profile_; 627 TestingProfile profile_;
629 628
630 scoped_ptr<SyncEngine> remote_sync_service_; 629 std::unique_ptr<SyncEngine> remote_sync_service_;
631 scoped_ptr<LocalFileSyncService> local_sync_service_; 630 std::unique_ptr<LocalFileSyncService> local_sync_service_;
632 631
633 int64_t pending_remote_changes_; 632 int64_t pending_remote_changes_;
634 int64_t pending_local_changes_; 633 int64_t pending_local_changes_;
635 634
636 scoped_ptr<FakeDriveServiceHelper> fake_drive_service_helper_; 635 std::unique_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
637 std::map<std::string, CannedSyncableFileSystem*> file_systems_; 636 std::map<std::string, CannedSyncableFileSystem*> file_systems_;
638 637
639 638
640 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; 639 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
641 scoped_refptr<base::SequencedTaskRunner> worker_task_runner_; 640 scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
642 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_; 641 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
643 642
644 DISALLOW_COPY_AND_ASSIGN(DriveBackendSyncTest); 643 DISALLOW_COPY_AND_ASSIGN(DriveBackendSyncTest);
645 }; 644 };
646 645
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 1723
1725 EXPECT_EQ(1u, CountApp()); 1724 EXPECT_EQ(1u, CountApp());
1726 EXPECT_EQ(1u, CountLocalFile(app_id)); 1725 EXPECT_EQ(1u, CountLocalFile(app_id));
1727 1726
1728 EXPECT_EQ(2u, CountMetadata()); 1727 EXPECT_EQ(2u, CountMetadata());
1729 EXPECT_EQ(2u, CountTracker()); 1728 EXPECT_EQ(2u, CountTracker());
1730 } 1729 }
1731 1730
1732 } // namespace drive_backend 1731 } // namespace drive_backend
1733 } // namespace sync_file_system 1732 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698