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

Unified Diff: chrome/browser/chromeos/drive/sync_client_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/sync_client_unittest.cc
diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc
index ec76076e4a82953ceb753fd347d265e09b9311e6..ee1f08f3515bbe2a6566ab21de27f67be118fda1 100644
--- a/chrome/browser/chromeos/drive/sync_client_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc
@@ -95,11 +95,12 @@ class SyncClientTest : public testing::Test {
drive_service_->LoadAccountMetadataForWapi(
"gdata/account_metadata.json");
- scheduler_.reset(new JobScheduler(profile_.get(), drive_service_.get(),
- base::MessageLoopProxy::current()));
+ scheduler_.reset(new JobScheduler(profile_.get(),
+ drive_service_.get(),
+ base::MessageLoopProxy::current().get()));
metadata_storage_.reset(new ResourceMetadataStorage(
- temp_dir_.path(), base::MessageLoopProxy::current()));
+ temp_dir_.path(), base::MessageLoopProxy::current().get()));
ASSERT_TRUE(metadata_storage_->Initialize());
metadata_.reset(new internal::ResourceMetadata(
@@ -108,13 +109,13 @@ class SyncClientTest : public testing::Test {
cache_.reset(new FileCache(metadata_storage_.get(),
temp_dir_.path(),
- base::MessageLoopProxy::current(),
+ base::MessageLoopProxy::current().get(),
NULL /* free_disk_space_getter */));
ASSERT_TRUE(cache_->Initialize());
ASSERT_NO_FATAL_FAILURE(SetUpTestData());
- sync_client_.reset(new SyncClient(base::MessageLoopProxy::current(),
+ sync_client_.reset(new SyncClient(base::MessageLoopProxy::current().get(),
&observer_,
scheduler_.get(),
metadata_.get(),
@@ -182,7 +183,9 @@ class SyncClientTest : public testing::Test {
// Load data from the service to the metadata.
FileError error = FILE_ERROR_FAILED;
internal::ChangeListLoader change_list_loader(
- base::MessageLoopProxy::current(), metadata_.get(), scheduler_.get());
+ base::MessageLoopProxy::current().get(),
+ metadata_.get(),
+ scheduler_.get());
change_list_loader.LoadIfNeeded(
DirectoryFetchInfo(),
google_apis::test_util::CreateCopyResultCallback(&error));

Powered by Google App Engine
This is Rietveld 408576698