Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7172)

Unified Diff: chrome/browser/chromeos/drive/search_metadata_unittest.cc

Issue 12706012: chromeos: Destruct DriveResourceMetadata on the blocking pool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add note Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/search_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
index 12af94b0e6cfac4ec3fe5dbcaddbc668d15e00b9..b40e156cd57ba5adaa57cde5cd97be31274c83a9 100644
--- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
@@ -48,15 +48,15 @@ class SearchMetadataTest : public testing::Test {
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(),
@@ -72,7 +72,7 @@ class SearchMetadataTest : public testing::Test {
}
virtual void TearDown() OVERRIDE {
- test_util::DeleteDriveCache(drive_cache_);
+ drive_cache_.reset();
}
protected:
@@ -82,7 +82,7 @@ class SearchMetadataTest : public testing::Test {
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_;
};

Powered by Google App Engine
This is Rietveld 408576698