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

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

Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/file_cache_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc
index 8a8e37b0aad9d06d71e7ebb09ce1b686ab2e5d23..5df6472e8e7c7cc5b0b25ada37488007d0aeb1de 100644
--- a/chrome/browser/chromeos/drive/file_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc
@@ -77,11 +77,11 @@ class FileCacheTestOnUIThread : public testing::Test {
pool->GetSequencedTaskRunner(pool->GetSequenceToken());
metadata_storage_.reset(new ResourceMetadataStorage(
- temp_dir_.path(), blocking_task_runner_));
+ temp_dir_.path(), blocking_task_runner_.get()));
bool success = false;
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&ResourceMetadataStorage::Initialize,
base::Unretained(metadata_storage_.get())),
@@ -97,10 +97,9 @@ class FileCacheTestOnUIThread : public testing::Test {
success = false;
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
- base::Bind(&FileCache::Initialize,
- base::Unretained(cache_.get())),
+ base::Bind(&FileCache::Initialize, base::Unretained(cache_.get())),
google_apis::test_util::CreateCopyResultCallback(&success));
google_apis::test_util::RunBlockingPoolTask();
ASSERT_TRUE(success);
@@ -898,13 +897,13 @@ class FileCacheTest : public testing::Test {
metadata_storage_.reset(new ResourceMetadataStorage(
temp_dir_.path().Append(util::kMetadataDirectory),
- base::MessageLoopProxy::current()));
+ base::MessageLoopProxy::current().get()));
ASSERT_TRUE(metadata_storage_->Initialize());
cache_.reset(new FileCache(
metadata_storage_.get(),
temp_dir_.path().Append(util::kCacheFileDirectory),
- base::MessageLoopProxy::current(),
+ base::MessageLoopProxy::current().get(),
fake_free_disk_space_getter_.get()));
ASSERT_TRUE(cache_->Initialize());
}
@@ -944,12 +943,12 @@ TEST_F(FileCacheTest, ScanCacheFile) {
// Create a new cache and initialize it.
metadata_storage_.reset(new ResourceMetadataStorage(
- metadata_directory, base::MessageLoopProxy::current()));
+ metadata_directory, base::MessageLoopProxy::current().get()));
ASSERT_TRUE(metadata_storage_->Initialize());
cache_.reset(new FileCache(metadata_storage_.get(),
temp_dir_.path().Append(util::kCacheFileDirectory),
- base::MessageLoopProxy::current(),
+ base::MessageLoopProxy::current().get(),
fake_free_disk_space_getter_.get()));
ASSERT_TRUE(cache_->Initialize());
« no previous file with comments | « chrome/browser/chromeos/drive/file_cache.cc ('k') | chrome/browser/chromeos/drive/file_system/operation_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698