[NOCOMMIT] Make DriveService{Wrapper|Messenger} class

chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 38 matching lines @@
   typedef FakeRemoteChangeProcessor::URLToFileChangesMap URLToFileChangesMap;
 
   ConflictResolverTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
   virtual ~ConflictResolverTest() {}
 
   virtual void SetUp() OVERRIDE {
     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(),
+        new FakeDriveServiceHelper(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()));
     context_->SetRemoteChangeProcessor(fake_remote_change_processor_.get());
 
     RegisterSyncableFileSystem();
 
     sync_task_manager_.reset(new SyncTaskManager(
         base::WeakPtr<SyncTaskManager::Client>(),
         10 /* maximum_background_task */));
     sync_task_manager_->Initialize(SYNC_STATUS_OK);
   }
 
   virtual void TearDown() OVERRIDE {
     sync_task_manager_.reset();
-    fake_drive_service_.reset();
     drive_uploader_.reset();
 
     RevokeSyncableFileSystem();
 
     fake_remote_change_processor_.reset();
     fake_drive_helper_.reset();
     context_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
@@ skipping 169 matching lines @@
       const URLToFileChangesMap& expected_changes) {
     fake_remote_change_processor_->VerifyConsistency(expected_changes);
   }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir database_dir_;
   scoped_ptr<leveldb::Env> in_memory_env_;
 
   scoped_ptr<SyncEngineContext> context_;
-  scoped_ptr<FakeDriveServiceWrapper> fake_drive_service_;
   scoped_ptr<drive::DriveUploaderInterface> drive_uploader_;
   scoped_ptr<FakeDriveServiceHelper> fake_drive_helper_;
   scoped_ptr<FakeRemoteChangeProcessor> fake_remote_change_processor_;
 
   scoped_ptr<SyncTaskManager> sync_task_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolverTest);
 };
 
 TEST_F(ConflictResolverTest, NoFileToBeResolved) {
@@ skipping 232 matching lines @@
 
   EXPECT_EQ(4, CountParents(file));
 
   EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());
 
   EXPECT_EQ(1, CountParents(file));
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system