Change ScriptInjection to work with WebLocalFrames.

extensions/renderer/user_script_set.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/user_script_set.h"
 
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
@@ skipping 153 matching lines @@
                                    tab_id,
                                    run_location,
                                    document_url,
                                    extension,
                                    true /* is_declarative */);
     }
   }
   return scoped_ptr<ScriptInjection>();
 }
 
+// TODO(dcheng): Scripts can't be injected on a remote frame, so this function
+// signature needs to be updated.
 scoped_ptr<ScriptInjection> UserScriptSet::GetInjectionForScript(
     UserScript* script,
     blink::WebFrame* web_frame,
     int tab_id,
     UserScript::RunLocation run_location,
     const GURL& document_url,
     const Extension* extension,
     bool is_declarative) {
   scoped_ptr<ScriptInjection> injection;
   if (web_frame->parent() && !script->match_all_frames())
@@ skipping 17 matching lines @@
     return injection.Pass();
   }
 
   bool inject_css = !script->css_scripts().empty() &&
                     run_location == UserScript::DOCUMENT_START;
   bool inject_js =
       !script->js_scripts().empty() && script->run_location() == run_location;
   if (inject_css || inject_js) {
     injection.reset(new ScriptInjection(
         injector.Pass(),
-        web_frame,
+        web_frame->toWebLocalFrame(),
         extension->id(),
         run_location,
         tab_id));
   }
   return injection.Pass();
 }
 
 }  // namespace extensions