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

Unified Diff: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc

Issue 248853002: [NOCOMMIT] Make DriveService{Wrapper|Messenger} class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
index 64ac9dc992bdec992972a11ee4674c7bec79c5ce..6ba0283a75adbdcaaef704a91cc6c228a6aed440 100644
--- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
@@ -56,17 +56,18 @@ class LocalToRemoteSyncerTest : public testing::Test {
ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
- fake_drive_service_.reset(new FakeDriveServiceWrapper);
+ scoped_ptr<FakeDriveServiceWrapper>
+ fake_drive_service(new FakeDriveServiceWrapper);
- drive_uploader_.reset(new FakeDriveUploader(fake_drive_service_.get()));
+ drive_uploader_.reset(new FakeDriveUploader(fake_drive_service.get()));
fake_drive_helper_.reset(new FakeDriveServiceHelper(
- fake_drive_service_.get(),
+ fake_drive_service.get(),
drive_uploader_.get(),
kSyncRootFolderTitle));
fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor);
context_.reset(new SyncEngineContext(
- fake_drive_service_.get(),
+ fake_drive_service.PassAs<drive::DriveServiceInterface>(),
drive_uploader_.get(),
base::MessageLoopProxy::current(),
base::MessageLoopProxy::current()));
@@ -82,7 +83,6 @@ class LocalToRemoteSyncerTest : public testing::Test {
virtual void TearDown() OVERRIDE {
sync_task_manager_.reset();
- fake_drive_service_.reset();
drive_uploader_.reset();
RevokeSyncableFileSystem();
@@ -242,7 +242,6 @@ class LocalToRemoteSyncerTest : public testing::Test {
base::ScopedTempDir database_dir_;
scoped_ptr<leveldb::Env> in_memory_env_;
- scoped_ptr<FakeDriveServiceWrapper> fake_drive_service_;
scoped_ptr<drive::DriveUploaderInterface> drive_uploader_;
scoped_ptr<SyncEngineContext> context_;
scoped_ptr<FakeDriveServiceHelper> fake_drive_helper_;

Powered by Google App Engine
This is Rietveld 408576698