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

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

Issue 660873002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (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/register_app_task.h" 5 #include "chrome/browser/sync_file_system/drive_backend/register_app_task.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 fake_drive_service(new drive::FakeDriveService); 51 fake_drive_service(new drive::FakeDriveService);
52 scoped_ptr<drive::DriveUploaderInterface> 52 scoped_ptr<drive::DriveUploaderInterface>
53 drive_uploader(new drive::DriveUploader( 53 drive_uploader(new drive::DriveUploader(
54 fake_drive_service.get(), 54 fake_drive_service.get(),
55 base::ThreadTaskRunnerHandle::Get())); 55 base::ThreadTaskRunnerHandle::Get()));
56 56
57 fake_drive_service_helper_.reset(new FakeDriveServiceHelper( 57 fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
58 fake_drive_service.get(), drive_uploader.get(), 58 fake_drive_service.get(), drive_uploader.get(),
59 kSyncRootFolderTitle)); 59 kSyncRootFolderTitle));
60 60
61 context_.reset( 61 context_.reset(new SyncEngineContext(fake_drive_service.Pass(),
62 new SyncEngineContext( 62 drive_uploader.Pass(),
63 fake_drive_service.PassAs<drive::DriveServiceInterface>(), 63 nullptr,
64 drive_uploader.Pass(), 64 base::ThreadTaskRunnerHandle::Get(),
65 nullptr, 65 base::ThreadTaskRunnerHandle::Get()));
66 base::ThreadTaskRunnerHandle::Get(),
67 base::ThreadTaskRunnerHandle::Get()));
68 66
69 ASSERT_EQ(google_apis::HTTP_CREATED, 67 ASSERT_EQ(google_apis::HTTP_CREATED,
70 fake_drive_service_helper_->AddOrphanedFolder( 68 fake_drive_service_helper_->AddOrphanedFolder(
71 kSyncRootFolderTitle, &sync_root_folder_id_)); 69 kSyncRootFolderTitle, &sync_root_folder_id_));
72 } 70 }
73 71
74 virtual void TearDown() override { 72 virtual void TearDown() override {
75 context_.reset(); 73 context_.reset();
76 base::RunLoop().RunUntilIdle(); 74 base::RunLoop().RunUntilIdle();
77 } 75 }
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 304
307 CreateMetadataDatabase(db.Pass()); 305 CreateMetadataDatabase(db.Pass());
308 RunRegisterAppTask(kAppID); 306 RunRegisterAppTask(kAppID);
309 307
310 EXPECT_EQ(1u, CountRegisteredAppRoot()); 308 EXPECT_EQ(1u, CountRegisteredAppRoot());
311 EXPECT_TRUE(IsAppRegistered(kAppID)); 309 EXPECT_TRUE(IsAppRegistered(kAppID));
312 } 310 }
313 311
314 } // namespace drive_backend 312 } // namespace drive_backend
315 } // namespace sync_file_system 313 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698