chromeos: Destruct DriveResourceMetadata on the blocking pool

chrome/browser/chromeos/drive/drive_sync_client_unittest.cc

 // Copyright (c) 2012 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/drive_sync_client.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 62 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     mock_network_change_notifier_.reset(new MockNetworkChangeNotifier);
 
     // Create a temporary directory.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // Initialize the cache.
     scoped_refptr<base::SequencedWorkerPool> pool =
         content::BrowserThread::GetBlockingPool();
-    cache_ = new DriveCache(
+    cache_.reset(new DriveCache(
         temp_dir_.path(),
         pool->GetSequencedTaskRunner(pool->GetSequenceToken()),
-        NULL /* free_disk_space_getter */);
+        NULL /* free_disk_space_getter */));
     bool cache_initialization_success = false;
     cache_->RequestInitialize(
         base::Bind(&test_util::CopyResultFromInitializeCacheCallback,
                    &cache_initialization_success));
     google_apis::test_util::RunBlockingPoolTask();
     ASSERT_TRUE(cache_initialization_success);
     SetUpCache();
 
     // Initialize the sync client.
     sync_client_.reset(new DriveSyncClient(profile_.get(),
                                            mock_file_system_.get(),
-                                           cache_));
+                                           cache_.get()));
 
     EXPECT_CALL(*mock_file_system_, AddObserver(sync_client_.get())).Times(1);
     EXPECT_CALL(*mock_file_system_,
                 RemoveObserver(sync_client_.get())).Times(1);
 
     // Disable delaying so that DoSyncLoop() starts immediately.
     sync_client_->set_delay_for_testing(base::TimeDelta::FromSeconds(0));
     sync_client_->Initialize();
   }
 
   virtual void TearDown() OVERRIDE {
     // The sync client should be deleted before NetworkLibrary, as the sync
     // client registers itself as observer of NetworkLibrary.
     sync_client_.reset();
-    test_util::DeleteDriveCache(cache_);
+    cache_.reset();
     mock_network_change_notifier_.reset();
   }
 
   // Sets up cache for tests.
   void SetUpCache() {
     // Prepare a temp file.
     base::FilePath temp_file;
     EXPECT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(),
                                                     &temp_file));
     const std::string content = "hello";
@@ skipping 123 matching lines @@
     sync_client_->AddResourceIdForTesting(DriveSyncClient::UPLOAD,
                                           resource_id);
   }
 
  protected:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   base::ScopedTempDir temp_dir_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<StrictMock<MockDriveFileSystem> > mock_file_system_;
-  DriveCache* cache_;
+  scoped_ptr<DriveCache, test_util::DestroyHelperForTests> cache_;
   scoped_ptr<DriveSyncClient> sync_client_;
   scoped_ptr<MockNetworkChangeNotifier> mock_network_change_notifier_;
 };
 
 TEST_F(DriveSyncClientTest, StartInitialScan) {
   // Start processing the files in the backlog. This will collect the
   // resource IDs of these files.
   sync_client_->StartProcessingBacklog();
 
   // Check the contents of the queue for fetching.
@@ skipping 61 matching lines @@
   // Start checking the existing pinned files. This will collect the resource
   // IDs of pinned files, with stale local cache files.
   sync_client_->StartCheckingExistingPinnedFiles();
 
   SetExpectationForGetFileByResourceId("resource_id_fetched");
 
   google_apis::test_util::RunBlockingPoolTask();
 }
 
 }  // namespace drive