content/browser/renderer_host/database_message_filter.cc - Issue 11275088: Remove implicit scoped_refptr 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: content/browser/renderer_host/database_message_filter.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 8 years, 2 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 | « content/browser/renderer_host/async_resource_handler.cc ('k') | content/browser/renderer_host/media/audio_input_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/database_message_filter.cc

diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc

index f0ff6ca8feac58f436f5c4e2c3e4c3d735bc790b..6e228032fe73f0eefb23288acd5944a4c97c09fa 100644

--- a/content/browser/renderer_host/database_message_filter.cc

+++ b/content/browser/renderer_host/database_message_filter.cc

@@ -137,7 +137,8 @@ void DatabaseMessageFilter::OnDatabaseOpenFile(const string16& vfs_file_name,

!db_tracker_->IsDatabaseScheduledForDeletion(origin_identifier,

database_name)) {

FilePath db_file =

- DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);

+ DatabaseUtil::GetFullFilePathForVfsFile(

+ db_tracker_.get(), vfs_file_name);

if (!db_file.empty()) {

if (db_tracker_->IsIncognitoProfile()) {

db_tracker_->GetIncognitoFileHandle(vfs_file_name, &file_handle);

@@ -181,7 +182,7 @@ void DatabaseMessageFilter::DatabaseDeleteFile(const string16& vfs_file_name,

// be deleted after kNumDeleteRetries attempts.

int error_code = SQLITE_IOERR_DELETE;

FilePath db_file =

- DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);

+ DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_.get(), vfs_file_name);

if (!db_file.empty()) {

// In order to delete a journal file in incognito mode, we only need to

// close the open handle to it that's stored in the database tracker.

@@ -223,7 +224,7 @@ void DatabaseMessageFilter::OnDatabaseGetFileAttributes(

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));

int32 attributes = -1;

FilePath db_file =

- DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);

+ DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_.get(), vfs_file_name);

if (!db_file.empty())

attributes = VfsBackend::GetFileAttributes(db_file);

@@ -237,7 +238,7 @@ void DatabaseMessageFilter::OnDatabaseGetFileSize(

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));

int64 size = 0;

FilePath db_file =

- DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_, vfs_file_name);

+ DatabaseUtil::GetFullFilePathForVfsFile(db_tracker_.get(), vfs_file_name);

if (!db_file.empty())

size = VfsBackend::GetFileSize(db_file);