chrome/browser/extensions/user_script_loader.cc - Issue 508513002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/

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/extensions/user_script_loader.cc

Issue 508513002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Two more Created 6 years, 4 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/extensions/updater/extension_downloader.cc ('k') | chrome/browser/extensions/webstore_installer.cc » ('j') | chrome/browser/extensions/webstore_standalone_installer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/user_script_loader.cc

diff --git a/chrome/browser/extensions/user_script_loader.cc b/chrome/browser/extensions/user_script_loader.cc

index eb29baea7f64ea8238ffcf3179c255a585d41c24..ea22c450bafd2f6197361a2de9ba0a14afa7d511 100644

--- a/chrome/browser/extensions/user_script_loader.cc

+++ b/chrome/browser/extensions/user_script_loader.cc

@@ -84,7 +84,7 @@ bool LoadScriptContent(const ExtensionId& extension_id,

LOG(WARNING) << "Failed to load user script file: " << path.value();

return false;

}

- if (verifier) {

+ if (verifier.get()) {

content::BrowserThread::PostTask(content::BrowserThread::IO,

FROM_HERE,

base::Bind(&VerifyContent,

@@ -207,7 +207,7 @@ void LoadScriptsOnFileThread(scoped_ptr<UserScriptList> user_scripts,

LoadScriptsCallback callback) {

DCHECK(user_scripts.get());

LoadUserScripts(

- user_scripts.get(), extensions_info, added_script_ids, verifier);

+ user_scripts.get(), extensions_info, added_script_ids, verifier.get());

scoped_ptr<base::SharedMemory> memory = Serialize(*user_scripts);

BrowserThread::PostTask(

BrowserThread::UI,