chrome/browser/chromeos/drive/drive_integration_service.cc - Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/drive/drive_integration_service.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

« no previous file with comments | « chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc ('k') | chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7978b7269d4391a4205a32bb12d925d5d44d86dd..3ec76c1300d381cfd96b7f4a5ad940ab7e89b5d1 100644

--- a/chrome/browser/chromeos/drive/drive_integration_service.cc

+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc

@@ -157,14 +157,14 @@ DriveIntegrationService::DriveIntegrationService(

} else if (util::IsDriveV2ApiEnabled()) {

drive_service_.reset(new DriveAPIService(

g_browser_process->system_request_context(),

- blocking_task_runner_,

+ blocking_task_runner_.get(),

GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),

GURL(google_apis::DriveApiUrlGenerator::kBaseDownloadUrlForProduction),

GetDriveUserAgent()));

} else {

drive_service_.reset(new GDataWapiService(

g_browser_process->system_request_context(),

- blocking_task_runner_,

+ blocking_task_runner_.get(),

GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),

GURL(google_apis::GDataWapiUrlGenerator::kBaseDownloadUrlForProduction),

GetDriveUserAgent()));

@@ -210,7 +210,7 @@ void DriveIntegrationService::Initialize() {

file_system_->Initialize();

base::PostTaskAndReplyWithResult(

- blocking_task_runner_,

+ blocking_task_runner_.get(),

FROM_HERE,

base::Bind(&InitializeMetadata,

cache_root_directory_,