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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver_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/conflict_resolver.h" 5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 scoped_ptr<FakeDriveServiceWrapper> 61 scoped_ptr<FakeDriveServiceWrapper>
62 fake_drive_service(new FakeDriveServiceWrapper); 62 fake_drive_service(new FakeDriveServiceWrapper);
63 scoped_ptr<drive::DriveUploaderInterface> 63 scoped_ptr<drive::DriveUploaderInterface>
64 drive_uploader(new FakeDriveUploader(fake_drive_service.get())); 64 drive_uploader(new FakeDriveUploader(fake_drive_service.get()));
65 fake_drive_helper_.reset( 65 fake_drive_helper_.reset(
66 new FakeDriveServiceHelper(fake_drive_service.get(), 66 new FakeDriveServiceHelper(fake_drive_service.get(),
67 drive_uploader.get(), 67 drive_uploader.get(),
68 kSyncRootFolderTitle)); 68 kSyncRootFolderTitle));
69 remote_change_processor_.reset(new FakeRemoteChangeProcessor); 69 remote_change_processor_.reset(new FakeRemoteChangeProcessor);
70 70
71 context_.reset(new SyncEngineContext( 71 context_.reset(new SyncEngineContext(fake_drive_service.Pass(),
72 fake_drive_service.PassAs<drive::DriveServiceInterface>(), 72 drive_uploader.Pass(),
73 drive_uploader.Pass(), 73 nullptr,
74 nullptr, 74 base::ThreadTaskRunnerHandle::Get(),
75 base::ThreadTaskRunnerHandle::Get(), 75 base::ThreadTaskRunnerHandle::Get()));
76 base::ThreadTaskRunnerHandle::Get()));
77 context_->SetRemoteChangeProcessor(remote_change_processor_.get()); 76 context_->SetRemoteChangeProcessor(remote_change_processor_.get());
78 77
79 RegisterSyncableFileSystem(); 78 RegisterSyncableFileSystem();
80 79
81 sync_task_manager_.reset(new SyncTaskManager( 80 sync_task_manager_.reset(new SyncTaskManager(
82 base::WeakPtr<SyncTaskManager::Client>(), 81 base::WeakPtr<SyncTaskManager::Client>(),
83 10 /* maximum_background_task */, 82 10 /* maximum_background_task */,
84 base::ThreadTaskRunnerHandle::Get())); 83 base::ThreadTaskRunnerHandle::Get()));
85 sync_task_manager_->Initialize(SYNC_STATUS_OK); 84 sync_task_manager_->Initialize(SYNC_STATUS_OK);
86 } 85 }
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 517
519 EXPECT_EQ(4, CountParents(file)); 518 EXPECT_EQ(4, CountParents(file));
520 519
521 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver()); 520 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());
522 521
523 EXPECT_EQ(1, CountParents(file)); 522 EXPECT_EQ(1, CountParents(file));
524 } 523 }
525 524
526 } // namespace drive_backend 525 } // namespace drive_backend
527 } // namespace sync_file_system 526 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698