[NOCOMMIT] Make DriveService{Wrapper|Messenger} class

chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
index 6d102f1018daa36fa98144c0b81428e56aa19e33..571ff0fb534577899e7c07fc8b1b33b9f0de6217 100644
--- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
@@ -46,20 +46,23 @@ class RegisterAppTaskTest : public testing::Test {
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
-    fake_drive_service_.reset(new drive::FakeDriveService);
+    scoped_ptr<drive::FakeDriveService>
+        fake_drive_service(new drive::FakeDriveService);
 
-    drive_uploader_.reset(new drive::DriveUploader(
-        fake_drive_service_.get(), base::MessageLoopProxy::current()));
+    drive_uploader_.reset(
+        new drive::DriveUploader(fake_drive_service.get(),
+                                 base::MessageLoopProxy::current()));
 
-    fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_.get(), drive_uploader_.get(),
-        kSyncRootFolderTitle));
+    fake_drive_service_helper_.reset(
+        new FakeDriveServiceHelper(fake_drive_service.get(),
+                                   drive_uploader_.get(),
+                                   kSyncRootFolderTitle));
 
-    context_.reset(
-        new SyncEngineContext(fake_drive_service_.get(),
-                              drive_uploader_.get(),
-                              base::MessageLoopProxy::current(),
-                              base::MessageLoopProxy::current()));
+    context_.reset(new SyncEngineContext(
+        fake_drive_service.PassAs<drive::DriveServiceInterface>(),
+        drive_uploader_.get(),
+        base::MessageLoopProxy::current(),
+        base::MessageLoopProxy::current()));
 
     ASSERT_EQ(google_apis::HTTP_CREATED,
               fake_drive_service_helper_->AddOrphanedFolder(
@@ -68,7 +71,6 @@ class RegisterAppTaskTest : public testing::Test {
 
   virtual void TearDown() OVERRIDE {
     context_.reset();
-    fake_drive_service_.reset();
     drive_uploader_.reset();
     base::RunLoop().RunUntilIdle();
   }
@@ -245,7 +247,6 @@ class RegisterAppTaskTest : public testing::Test {
   base::ScopedTempDir database_dir_;
 
   scoped_ptr<SyncEngineContext> context_;
-  scoped_ptr<drive::FakeDriveService> fake_drive_service_;
   scoped_ptr<drive::DriveUploaderInterface> drive_uploader_;
   scoped_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;