[NOCOMMIT] Make DriveService{Wrapper|Messenger} class

chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
index aafc2bc2bdc254a149e8e07f4a83dccf33733883..1be9eaef81b466b4915c8560c0ffd1af7f6b6a79 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -56,17 +56,18 @@ class ConflictResolverTest : 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(),
+        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()));
@@ -82,7 +83,6 @@ class ConflictResolverTest : public testing::Test {
 
   virtual void TearDown() OVERRIDE {
     sync_task_manager_.reset();
-    fake_drive_service_.reset();
     drive_uploader_.reset();
 
     RevokeSyncableFileSystem();
@@ -272,7 +272,6 @@ class ConflictResolverTest : public testing::Test {
   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_;