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/sync_engine_initializer_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_initializer. h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer. h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual void SetUp() OVERRIDE { 48 virtual void SetUp() OVERRIDE {
49 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); 49 ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
50 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); 50 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
51 51
52 scoped_ptr<drive::DriveServiceInterface> 52 scoped_ptr<drive::DriveServiceInterface>
53 fake_drive_service(new drive::FakeDriveService); 53 fake_drive_service(new drive::FakeDriveService);
54 54
55 sync_context_.reset(new SyncEngineContext( 55 sync_context_.reset(new SyncEngineContext(
56 fake_drive_service.Pass(), 56 fake_drive_service.Pass(),
57 scoped_ptr<drive::DriveUploaderInterface>(), 57 scoped_ptr<drive::DriveUploaderInterface>(),
58 NULL, 58 nullptr,
59 base::ThreadTaskRunnerHandle::Get(), 59 base::ThreadTaskRunnerHandle::Get(),
60 base::ThreadTaskRunnerHandle::Get())); 60 base::ThreadTaskRunnerHandle::Get()));
61 61
62 sync_task_manager_.reset(new SyncTaskManager( 62 sync_task_manager_.reset(new SyncTaskManager(
63 base::WeakPtr<SyncTaskManager::Client>(), 63 base::WeakPtr<SyncTaskManager::Client>(),
64 1 /* maximum_parallel_task */, 64 1 /* maximum_parallel_task */,
65 base::ThreadTaskRunnerHandle::Get())); 65 base::ThreadTaskRunnerHandle::Get()));
66 sync_task_manager_->Initialize(SYNC_STATUS_OK); 66 sync_task_manager_->Initialize(SYNC_STATUS_OK);
67 } 67 }
68 68
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 340
341 EXPECT_EQ(0u, CountTrackersForFile(sync_root->file_id())); 341 EXPECT_EQ(0u, CountTrackersForFile(sync_root->file_id()));
342 EXPECT_FALSE(HasNoParent(sync_root->file_id())); 342 EXPECT_FALSE(HasNoParent(sync_root->file_id()));
343 343
344 EXPECT_EQ(1u, CountFileMetadata()); 344 EXPECT_EQ(1u, CountFileMetadata());
345 EXPECT_EQ(1u, CountFileTracker()); 345 EXPECT_EQ(1u, CountFileTracker());
346 } 346 }
347 347
348 } // namespace drive_backend 348 } // namespace drive_backend
349 } // namespace sync_file_system 349 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698