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

Unified Diff: chrome/browser/chromeos/drive/file_system_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_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index 430539b0be1a22dca46f87d9f90695e334384435..27c7c786ea7ad6c4b96b47466ae48944b67ed0c0 100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -93,7 +93,7 @@ class FileSystemTest : public testing::Test {
scheduler_.reset(new JobScheduler(profile_.get(),
fake_drive_service_.get(),
- base::MessageLoopProxy::current()));
+ base::MessageLoopProxy::current().get()));
ASSERT_TRUE(file_util::CreateDirectory(util::GetCacheRootPath(
profile_.get()).Append(util::kMetadataDirectory)));
@@ -110,14 +110,14 @@ class FileSystemTest : public testing::Test {
void SetUpResourceMetadataAndFileSystem() {
metadata_storage_.reset(new internal::ResourceMetadataStorage(
util::GetCacheRootPath(profile_.get()).Append(util::kMetadataDirectory),
- base::MessageLoopProxy::current()));
+ base::MessageLoopProxy::current().get()));
ASSERT_TRUE(metadata_storage_->Initialize());
cache_.reset(new internal::FileCache(
metadata_storage_.get(),
util::GetCacheRootPath(profile_.get()).Append(
util::kCacheFileDirectory),
- base::MessageLoopProxy::current(),
+ base::MessageLoopProxy::current().get(),
fake_free_disk_space_getter_.get()));
ASSERT_TRUE(cache_->Initialize());
@@ -130,7 +130,7 @@ class FileSystemTest : public testing::Test {
fake_drive_service_.get(),
scheduler_.get(),
resource_metadata_.get(),
- base::MessageLoopProxy::current(),
+ base::MessageLoopProxy::current().get(),
util::GetCacheRootPath(profile_.get()).Append(
util::kTemporaryFileDirectory)));
file_system_->AddObserver(mock_directory_observer_.get());
@@ -214,8 +214,8 @@ class FileSystemTest : public testing::Test {
util::GetCacheRootPath(profile_.get()).Append(util::kMetadataDirectory);
scoped_ptr<internal::ResourceMetadataStorage,
test_util::DestroyHelperForTests> metadata_storage(
- new internal::ResourceMetadataStorage(
- metadata_directory, base::MessageLoopProxy::current()));
+ new internal::ResourceMetadataStorage(
+ metadata_directory, base::MessageLoopProxy::current().get()));
scoped_ptr<internal::ResourceMetadata, test_util::DestroyHelperForTests>
resource_metadata(new internal::ResourceMetadata(
« no previous file with comments | « chrome/browser/chromeos/drive/file_system_proxy.cc ('k') | chrome/browser/chromeos/drive/job_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698