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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_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 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/sync_engine.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 20 matching lines...) Expand all
31 public base::SupportsWeakPtr<SyncEngineTest> { 31 public base::SupportsWeakPtr<SyncEngineTest> {
32 public: 32 public:
33 typedef RemoteFileSyncService::OriginStatusMap RemoteOriginStatusMap; 33 typedef RemoteFileSyncService::OriginStatusMap RemoteOriginStatusMap;
34 34
35 SyncEngineTest() : worker_pool_owner_(1, "Worker") {} 35 SyncEngineTest() : worker_pool_owner_(1, "Worker") {}
36 ~SyncEngineTest() override {} 36 ~SyncEngineTest() override {}
37 37
38 void SetUp() override { 38 void SetUp() override {
39 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); 39 ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
40 40
41 scoped_ptr<drive::DriveServiceInterface> 41 std::unique_ptr<drive::DriveServiceInterface> fake_drive_service(
42 fake_drive_service(new drive::FakeDriveService); 42 new drive::FakeDriveService);
43 43
44 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = 44 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner =
45 base::ThreadTaskRunnerHandle::Get(); 45 base::ThreadTaskRunnerHandle::Get();
46 worker_task_runner_ = 46 worker_task_runner_ =
47 worker_pool_owner_.pool()->GetSequencedTaskRunnerWithShutdownBehavior( 47 worker_pool_owner_.pool()->GetSequencedTaskRunnerWithShutdownBehavior(
48 worker_pool_owner_.pool()->GetSequenceToken(), 48 worker_pool_owner_.pool()->GetSequenceToken(),
49 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); 49 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
50 50
51 sync_engine_.reset(new drive_backend::SyncEngine( 51 sync_engine_.reset(new drive_backend::SyncEngine(
52 ui_task_runner.get(), worker_task_runner_.get(), 52 ui_task_runner.get(), worker_task_runner_.get(),
53 nullptr, // drive_task_runner 53 nullptr, // drive_task_runner
54 worker_pool_owner_.pool().get(), profile_dir_.path(), 54 worker_pool_owner_.pool().get(), profile_dir_.path(),
55 nullptr, // task_logger 55 nullptr, // task_logger
56 nullptr, // notification_manager 56 nullptr, // notification_manager
57 nullptr, // extension_service 57 nullptr, // extension_service
58 nullptr, // signin_manager 58 nullptr, // signin_manager
59 nullptr, // token_service 59 nullptr, // token_service
60 nullptr, // request_context 60 nullptr, // request_context
61 nullptr, // drive_service_factory 61 nullptr, // drive_service_factory
62 nullptr)); // in_memory_env 62 nullptr)); // in_memory_env
63 63
64 sync_engine_->InitializeForTesting( 64 sync_engine_->InitializeForTesting(
65 std::move(fake_drive_service), 65 std::move(fake_drive_service),
66 nullptr, // drive_uploader 66 nullptr, // drive_uploader
67 scoped_ptr<SyncWorkerInterface>(new FakeSyncWorker)); 67 std::unique_ptr<SyncWorkerInterface>(new FakeSyncWorker));
68 sync_engine_->SetSyncEnabled(true); 68 sync_engine_->SetSyncEnabled(true);
69 sync_engine_->OnReadyToSendRequests(); 69 sync_engine_->OnReadyToSendRequests();
70 70
71 WaitForWorkerTaskRunner(); 71 WaitForWorkerTaskRunner();
72 } 72 }
73 73
74 void TearDown() override { 74 void TearDown() override {
75 sync_engine_.reset(); 75 sync_engine_.reset();
76 WaitForWorkerTaskRunner(); 76 WaitForWorkerTaskRunner();
77 77
78 worker_task_runner_ = nullptr; 78 worker_task_runner_ = nullptr;
79 } 79 }
80 80
81 bool FindOriginStatus(const GURL& origin, std::string* status) { 81 bool FindOriginStatus(const GURL& origin, std::string* status) {
82 scoped_ptr<RemoteOriginStatusMap> status_map; 82 std::unique_ptr<RemoteOriginStatusMap> status_map;
83 sync_engine()->GetOriginStatusMap(CreateResultReceiver(&status_map)); 83 sync_engine()->GetOriginStatusMap(CreateResultReceiver(&status_map));
84 WaitForWorkerTaskRunner(); 84 WaitForWorkerTaskRunner();
85 85
86 RemoteOriginStatusMap::const_iterator itr = status_map->find(origin); 86 RemoteOriginStatusMap::const_iterator itr = status_map->find(origin);
87 if (itr == status_map->end()) 87 if (itr == status_map->end())
88 return false; 88 return false;
89 89
90 *status = itr->second; 90 *status = itr->second;
91 // If an origin is uninstalled, it should not be found actually. 91 // If an origin is uninstalled, it should not be found actually.
92 if (*status == "Uninstalled") 92 if (*status == "Uninstalled")
(...skipping 26 matching lines...) Expand all
119 // Accessors 119 // Accessors
120 SyncEngine* sync_engine() { return sync_engine_.get(); } 120 SyncEngine* sync_engine() { return sync_engine_.get(); }
121 121
122 FakeSyncWorker* fake_sync_worker() { 122 FakeSyncWorker* fake_sync_worker() {
123 return static_cast<FakeSyncWorker*>(sync_engine_->sync_worker_.get()); 123 return static_cast<FakeSyncWorker*>(sync_engine_->sync_worker_.get());
124 } 124 }
125 125
126 private: 126 private:
127 content::TestBrowserThreadBundle browser_threads_; 127 content::TestBrowserThreadBundle browser_threads_;
128 base::ScopedTempDir profile_dir_; 128 base::ScopedTempDir profile_dir_;
129 scoped_ptr<drive_backend::SyncEngine> sync_engine_; 129 std::unique_ptr<drive_backend::SyncEngine> sync_engine_;
130 130
131 base::SequencedWorkerPoolOwner worker_pool_owner_; 131 base::SequencedWorkerPoolOwner worker_pool_owner_;
132 scoped_refptr<base::SequencedTaskRunner> worker_task_runner_; 132 scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(SyncEngineTest); 134 DISALLOW_COPY_AND_ASSIGN(SyncEngineTest);
135 }; 135 };
136 136
137 TEST_F(SyncEngineTest, OriginTest) { 137 TEST_F(SyncEngineTest, OriginTest) {
138 GURL origin("chrome-extension://app_0"); 138 GURL origin("chrome-extension://app_0");
139 139
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_0"), 180 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_0"),
181 CreateResultReceiver(&sync_status)); 181 CreateResultReceiver(&sync_status));
182 WaitForWorkerTaskRunner(); 182 WaitForWorkerTaskRunner();
183 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 183 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
184 184
185 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_1"), 185 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_1"),
186 CreateResultReceiver(&sync_status)); 186 CreateResultReceiver(&sync_status));
187 WaitForWorkerTaskRunner(); 187 WaitForWorkerTaskRunner();
188 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 188 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
189 189
190 scoped_ptr<RemoteOriginStatusMap> status_map; 190 std::unique_ptr<RemoteOriginStatusMap> status_map;
191 sync_engine()->GetOriginStatusMap(CreateResultReceiver(&status_map)); 191 sync_engine()->GetOriginStatusMap(CreateResultReceiver(&status_map));
192 WaitForWorkerTaskRunner(); 192 WaitForWorkerTaskRunner();
193 ASSERT_EQ(2u, status_map->size()); 193 ASSERT_EQ(2u, status_map->size());
194 EXPECT_EQ("Registered", (*status_map)[GURL("chrome-extension://app_0")]); 194 EXPECT_EQ("Registered", (*status_map)[GURL("chrome-extension://app_0")]);
195 EXPECT_EQ("Registered", (*status_map)[GURL("chrome-extension://app_1")]); 195 EXPECT_EQ("Registered", (*status_map)[GURL("chrome-extension://app_1")]);
196 196
197 sync_engine()->DisableOrigin(GURL("chrome-extension://app_1"), 197 sync_engine()->DisableOrigin(GURL("chrome-extension://app_1"),
198 CreateResultReceiver(&sync_status)); 198 CreateResultReceiver(&sync_status));
199 WaitForWorkerTaskRunner(); 199 WaitForWorkerTaskRunner();
200 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 200 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
(...skipping 26 matching lines...) Expand all
227 TEST_F(SyncEngineTest, ProcessRemoteChange) { 227 TEST_F(SyncEngineTest, ProcessRemoteChange) {
228 SyncStatusCode sync_status; 228 SyncStatusCode sync_status;
229 storage::FileSystemURL url; 229 storage::FileSystemURL url;
230 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url)); 230 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url));
231 WaitForWorkerTaskRunner(); 231 WaitForWorkerTaskRunner();
232 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 232 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
233 } 233 }
234 234
235 } // namespace drive_backend 235 } // namespace drive_backend
236 } // namespace sync_file_system 236 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698