chromeos: Destruct DriveResourceMetadata on the blocking pool

chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc

 // Copyright (c) 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/chromeos/drive/file_system/create_directory_operation.h"
 
 #include "base/message_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
@@ skipping 39 matching lines @@
         new DriveResourceMetadata(fake_drive_service_->GetRootResourceId(),
                                   blocking_task_runner_));
 
     scheduler_.reset(
         new DriveScheduler(profile_.get(), fake_drive_service_.get(), NULL));
     scheduler_->Initialize();
 
     drive_web_apps_registry_.reset(new DriveWebAppsRegistry);
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
-    cache_ = new DriveCache(
-        DriveCache::GetCacheRootPath(profile_.get()),
-        blocking_task_runner_,
-        fake_free_disk_space_getter_.get());
+    cache_.reset(new DriveCache(DriveCache::GetCacheRootPath(profile_.get()),
+                                blocking_task_runner_,
+                                fake_free_disk_space_getter_.get()));
 
     change_list_loader_.reset(new ChangeListLoader(
         metadata_.get(), scheduler_.get(), drive_web_apps_registry_.get(),
-        cache_));
+        cache_.get()));
 
     DriveFileError error = DRIVE_FILE_OK;
     change_list_loader_->LoadFromServerIfNeeded(
         DirectoryFetchInfo(),
         base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback,
                    &error));
     cache_->RequestInitializeForTesting();
     google_apis::test_util::RunBlockingPoolTask();
 
     operation_.reset(
         new CreateDirectoryOperation(scheduler_.get(), metadata_.get(), this));
   }
 
   virtual void TearDown() OVERRIDE {
     operation_.reset();
     change_list_loader_.reset();
-    test_util::DeleteDriveCache(cache_);
+    cache_.reset();
     fake_free_disk_space_getter_.reset();
     drive_web_apps_registry_.reset();
     scheduler_.reset();
     metadata_.reset();
     fake_drive_service_.reset();
     profile_.reset();
 
     blocking_task_runner_ = NULL;
   }
 
@@ skipping 26 matching lines @@
  private:
   MessageLoopForUI message_loop_;
   // The order of the test threads is important, do not change the order.
   // See also content/browser/browser_thread_impl.cc.
   content::TestBrowserThread ui_thread_;
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
   scoped_ptr<TestingProfile> profile_;
 
   scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
-  scoped_ptr<DriveResourceMetadata> metadata_;
+  test_util::DestroyHelperForTests<DriveResourceMetadata>::scoped_ptr metadata_;
   scoped_ptr<DriveScheduler> scheduler_;
   scoped_ptr<DriveWebAppsRegistry> drive_web_apps_registry_;
   scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
 
-  // The way to delete the DriveCache instance is a bit tricky, so here we use
-  // a raw point. See TearDown method for how to delete it.
-  DriveCache* cache_;
+  test_util::DestroyHelperForTests<DriveCache>::scoped_ptr cache_;
   scoped_ptr<ChangeListLoader> change_list_loader_;
 
   scoped_ptr<CreateDirectoryOperation> operation_;
 };
 
 TEST_F(CreateDirectoryOperationTest, FindFirstMissingParentDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument("chromeos/gdata/root_feed.json"));
 
   CreateDirectoryOperation::FindFirstMissingParentDirectoryResult result;
 
@@ skipping 47 matching lines @@
       base::FilePath(FILE_PATH_LITERAL("drive/Directory 1")),
       base::Bind(&CopyResultFromFindFirstMissingParentDirectory,
                  &result));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(CreateDirectoryOperation::FIND_FIRST_DIRECTORY_ALREADY_PRESENT,
             result.error);
 }
 
 }  // namespace file_system
 }  // namespace drive