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

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

Issue 16998003: 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/drive_integration_service.cc
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
index f3c4e1a7159fb5df541c87e8ca1df0c67c75ccba..b1bfcaf62ce149514d31f1d667033616efb44e44 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -118,9 +118,9 @@ DriveIntegrationService::DriveIntegrationService(
}
scheduler_.reset(new JobScheduler(profile_, drive_service_.get()));
cache_.reset(new internal::FileCache(
- !test_cache_root.empty() ? test_cache_root :
- util::GetCacheRootPath(profile),
- blocking_task_runner_,
+ !test_cache_root.empty() ? test_cache_root
+ : util::GetCacheRootPath(profile),
+ blocking_task_runner_.get(),
NULL /* free_disk_space_getter */));
drive_app_registry_.reset(new DriveAppRegistry(scheduler_.get()));
@@ -130,13 +130,14 @@ DriveIntegrationService::DriveIntegrationService(
cache_->GetCacheDirectoryPath(internal::FileCache::CACHE_TYPE_META),
blocking_task_runner_));
- file_system_.reset(test_file_system ? test_file_system :
- new FileSystem(profile_,
- cache_.get(),
- drive_service_.get(),
- scheduler_.get(),
- resource_metadata_.get(),
- blocking_task_runner_));
+ file_system_.reset(test_file_system
+ ? test_file_system
+ : new FileSystem(profile_,
+ cache_.get(),
+ drive_service_.get(),
+ scheduler_.get(),
+ resource_metadata_.get(),
+ blocking_task_runner_.get()));
file_write_helper_.reset(new FileWriteHelper(file_system()));
download_handler_.reset(new DownloadHandler(file_write_helper(),
file_system()));
@@ -259,7 +260,7 @@ void DriveIntegrationService::AddDriveMountPoint() {
bool success = mount_points->RegisterRemoteFileSystem(
drive_mount_point.BaseName().AsUTF8Unsafe(),
fileapi::kFileSystemTypeDrive,
- file_system_proxy_,
+ file_system_proxy_.get(),
drive_mount_point);
if (success) {
@@ -283,7 +284,7 @@ void DriveIntegrationService::RemoveDriveMountPoint() {
mount_points->RevokeFileSystem(
util::GetDriveMountPointPath().BaseName().AsUTF8Unsafe());
- if (file_system_proxy_) {
+ if (file_system_proxy_.get()) {
file_system_proxy_->DetachFromFileSystem();
file_system_proxy_ = NULL;
}
« no previous file with comments | « chrome/browser/chromeos/drive/drive_file_stream_reader.cc ('k') | chrome/browser/chromeos/drive/drive_protocol_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698