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

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

Issue 610223002: [SyncFS] Use nullptr instead of NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/sync_engine.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
(...skipping 30 matching lines...) Expand all
41 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = 41 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner =
42 base::ThreadTaskRunnerHandle::Get(); 42 base::ThreadTaskRunnerHandle::Get();
43 worker_task_runner_ = 43 worker_task_runner_ =
44 worker_pool_->GetSequencedTaskRunnerWithShutdownBehavior( 44 worker_pool_->GetSequencedTaskRunnerWithShutdownBehavior(
45 worker_pool_->GetSequenceToken(), 45 worker_pool_->GetSequenceToken(),
46 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); 46 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
47 47
48 sync_engine_.reset(new drive_backend::SyncEngine( 48 sync_engine_.reset(new drive_backend::SyncEngine(
49 ui_task_runner.get(), 49 ui_task_runner.get(),
50 worker_task_runner_.get(), 50 worker_task_runner_.get(),
51 NULL /* drive_task_runner */, 51 nullptr /* drive_task_runner */,
52 profile_dir_.path(), 52 profile_dir_.path(),
53 NULL /* task_logger */, 53 nullptr /* task_logger */,
54 NULL /* notification_manager */, 54 nullptr /* notification_manager */,
55 NULL /* extension_service */, 55 nullptr /* extension_service */,
56 NULL /* signin_manager */, 56 nullptr /* signin_manager */,
57 NULL /* token_service */, 57 nullptr /* token_service */,
58 NULL /* request_context */, 58 nullptr /* request_context */,
59 scoped_ptr<SyncEngine::DriveServiceFactory>(), 59 scoped_ptr<SyncEngine::DriveServiceFactory>(),
60 NULL /* in_memory_env */)); 60 nullptr /* in_memory_env */));
61 61
62 sync_engine_->InitializeForTesting( 62 sync_engine_->InitializeForTesting(
63 fake_drive_service.Pass(), 63 fake_drive_service.Pass(),
64 scoped_ptr<drive::DriveUploaderInterface>(), 64 scoped_ptr<drive::DriveUploaderInterface>(),
65 scoped_ptr<SyncWorkerInterface>(new FakeSyncWorker)); 65 scoped_ptr<SyncWorkerInterface>(new FakeSyncWorker));
66 sync_engine_->SetSyncEnabled(true); 66 sync_engine_->SetSyncEnabled(true);
67 sync_engine_->OnReadyToSendRequests(); 67 sync_engine_->OnReadyToSendRequests();
68 68
69 WaitForWorkerTaskRunner(); 69 WaitForWorkerTaskRunner();
70 } 70 }
71 71
72 virtual void TearDown() OVERRIDE { 72 virtual void TearDown() OVERRIDE {
73 sync_engine_.reset(); 73 sync_engine_.reset();
74 WaitForWorkerTaskRunner(); 74 WaitForWorkerTaskRunner();
75 worker_pool_->Shutdown(); 75 worker_pool_->Shutdown();
76 76
77 worker_task_runner_ = NULL; 77 worker_task_runner_ = nullptr;
78 worker_pool_ = NULL; 78 worker_pool_ = nullptr;
79 79
80 base::RunLoop().RunUntilIdle(); 80 base::RunLoop().RunUntilIdle();
81 } 81 }
82 82
83 bool FindOriginStatus(const GURL& origin, std::string* status) { 83 bool FindOriginStatus(const GURL& origin, std::string* status) {
84 scoped_ptr<RemoteOriginStatusMap> status_map; 84 scoped_ptr<RemoteOriginStatusMap> status_map;
85 sync_engine()->GetOriginStatusMap(CreateResultReceiver(&status_map)); 85 sync_engine()->GetOriginStatusMap(CreateResultReceiver(&status_map));
86 WaitForWorkerTaskRunner(); 86 WaitForWorkerTaskRunner();
87 87
88 RemoteOriginStatusMap::const_iterator itr = status_map->find(origin); 88 RemoteOriginStatusMap::const_iterator itr = status_map->find(origin);
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 TEST_F(SyncEngineTest, ProcessRemoteChange) { 229 TEST_F(SyncEngineTest, ProcessRemoteChange) {
230 SyncStatusCode sync_status; 230 SyncStatusCode sync_status;
231 storage::FileSystemURL url; 231 storage::FileSystemURL url;
232 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url)); 232 sync_engine()->ProcessRemoteChange(CreateResultReceiver(&sync_status, &url));
233 WaitForWorkerTaskRunner(); 233 WaitForWorkerTaskRunner();
234 EXPECT_EQ(SYNC_STATUS_OK, sync_status); 234 EXPECT_EQ(SYNC_STATUS_OK, sync_status);
235 } 235 }
236 236
237 } // namespace drive_backend 237 } // namespace drive_backend
238 } // namespace sync_file_system 238 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698