| Index: extensions/renderer/user_script_set_manager.cc
|
| diff --git a/extensions/renderer/user_script_set_manager.cc b/extensions/renderer/user_script_set_manager.cc
|
| index 4379bab3e9d01a3957b9a79109b91e47604dba74..2a6425fb34e7b019ba131e61245d95a71c3adebc 100644
|
| --- a/extensions/renderer/user_script_set_manager.cc
|
| +++ b/extensions/renderer/user_script_set_manager.cc
|
| @@ -38,9 +38,9 @@ UserScriptSetManager::GetInjectionForDeclarativeScript(
|
| blink::WebFrame* web_frame,
|
| int tab_id,
|
| const GURL& url,
|
| - const Extension* extension) {
|
| + const std::string& extension_id) {
|
| UserScriptSet* user_script_set =
|
| - GetProgrammaticScriptsByExtension(extension->id());
|
| + GetProgrammaticScriptsByExtension(extension_id);
|
| if (!user_script_set)
|
| return scoped_ptr<ScriptInjection>();
|
|
|
| @@ -49,8 +49,7 @@ UserScriptSetManager::GetInjectionForDeclarativeScript(
|
| web_frame,
|
| tab_id,
|
| UserScript::BROWSER_DRIVEN,
|
| - url,
|
| - extension);
|
| + url);
|
| }
|
|
|
| bool UserScriptSetManager::OnControlMessageReceived(
|
|
|