chromeos: Destruct DriveResourceMetadata on the blocking pool

chrome/browser/chromeos/drive/search_metadata_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/search_metadata.h"
 
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
@@ skipping 30 matching lines @@
 
     fake_drive_service_.reset(new google_apis::FakeDriveService);
     fake_drive_service_->LoadResourceListForWapi(
         "chromeos/gdata/root_feed.json");
     fake_drive_service_->LoadAccountMetadataForWapi(
         "chromeos/gdata/account_metadata.json");
     fake_drive_service_->LoadAppListForDriveApi("chromeos/drive/applist.json");
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
-    drive_cache_ = new DriveCache(
+    drive_cache_.reset(new DriveCache(
         DriveCache::GetCacheRootPath(profile_.get()),
         blocking_task_runner_,
-        fake_free_disk_space_getter_.get());
+        fake_free_disk_space_getter_.get()));
 
     drive_webapps_registry_.reset(new DriveWebAppsRegistry);
 
     file_system_.reset(new DriveFileSystem(profile_.get(),
-                                           drive_cache_,
+                                           drive_cache_.get(),
                                            fake_drive_service_.get(),
                                            NULL,  // uploader
                                            drive_webapps_registry_.get(),
                                            blocking_task_runner_));
     file_system_->Initialize();
     DriveFileError error = DRIVE_FILE_ERROR_FAILED;
     file_system_->change_list_loader()->LoadFromServerIfNeeded(
         DirectoryFetchInfo(),
         base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback,
                    &error));
     google_apis::test_util::RunBlockingPoolTask();
     ASSERT_EQ(DRIVE_FILE_OK, error);
   }
 
   virtual void TearDown() OVERRIDE {
-    test_util::DeleteDriveCache(drive_cache_);
+    drive_cache_.reset();
   }
 
  protected:
   MessageLoopForUI message_loop_;
   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<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
-  DriveCache* drive_cache_;
+  scoped_ptr<DriveCache, test_util::DestroyHelperForTests> drive_cache_;
   scoped_ptr<DriveWebAppsRegistry> drive_webapps_registry_;
   scoped_ptr<DriveFileSystem> file_system_;
 };
 
 TEST_F(SearchMetadataTest, SearchMetadata_ZeroMatches) {
   DriveFileError error = DRIVE_FILE_ERROR_FAILED;
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(file_system_.get(),
                  "NonExistent",
@@ skipping 219 matching lines @@
   EXPECT_EQ("&lt;<b>hello</b>&gt;", highlighted_text);
 }
 
 TEST(SearchMetadataSimpleTest, FindAndHighlight_MoreMetaChars) {
   std::string highlighted_text;
   EXPECT_TRUE(FindAndHighlight("a&b&c&d", "b&c", &highlighted_text));
   EXPECT_EQ("a&amp;<b>b&amp;c</b>&amp;d", highlighted_text);
 }
 
 }   // namespace drive