Make ContentRendererClient::DidCreateScriptContext take a WebLocalFrame.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 145 matching lines @@
 using base::UserMetricsAction;
 using content::PluginInstanceThrottler;
 using content::RenderFrame;
 using content::RenderThread;
 using content::WebPluginInfo;
 using extensions::Extension;
 using blink::WebCache;
 using blink::WebConsoleMessage;
 using blink::WebDataSource;
 using blink::WebDocument;
-using blink::WebFrame;
-using blink::WebLocalFrame;
 using blink::WebPlugin;
 using blink::WebPluginParams;
 using blink::WebSecurityOrigin;
 using blink::WebSecurityPolicy;
 using blink::WebString;
 using blink::WebURL;
 using blink::WebURLError;
 using blink::WebURLRequest;
 using blink::WebURLResponse;
 using blink::WebVector;
@@ skipping 448 matching lines @@
 ChromeContentRendererClient::CreatePluginPlaceholder(
     content::RenderFrame* render_frame,
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& orig_params) {
   return CreateShadowDOMPlaceholderForPluginInfo(
       render_frame, frame, orig_params);
 }
 
 bool ChromeContentRendererClient::OverrideCreatePlugin(
     content::RenderFrame* render_frame,
-    WebLocalFrame* frame,
+    blink::WebLocalFrame* frame,
     const WebPluginParams& params,
     WebPlugin** plugin) {
   std::string orig_mime_type = params.mimeType.utf8();
 #if defined(ENABLE_EXTENSIONS)
   if (orig_mime_type == content::kBrowserPluginMimeType) {
     bool guest_view_api_available = false;
     extension_dispatcher_->script_context_set().ForEach(
         render_frame->GetRenderView(),
         base::Bind(&IsGuestViewApiAvailableToScriptContext,
                    &guest_view_api_available));
@@ skipping 36 matching lines @@
     return;
   }
 
   // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
   new prerender::PrerenderMediaLoadDeferrer(render_frame, closure);
 #endif
 }
 
 WebPlugin* ChromeContentRendererClient::CreatePlugin(
     content::RenderFrame* render_frame,
-    WebLocalFrame* frame,
+    blink::WebLocalFrame* frame,
     const WebPluginParams& original_params,
     const ChromeViewHostMsg_GetPluginInfo_Output& output) {
   const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status;
   const WebPluginInfo& info = output.plugin;
   const std::string& actual_mime_type = output.actual_mime_type;
   const base::string16& group_name = output.group_name;
   const std::string& identifier = output.group_identifier;
   ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value;
   GURL url(original_params.url);
   std::string orig_mime_type = original_params.mimeType.utf8();
@@ skipping 531 matching lines @@
     case extensions::Feature::CONTENT_SCRIPT_CONTEXT:
       return true;
     case extensions::Feature::BLESSED_WEB_PAGE_CONTEXT:
       return !current_context->web_frame()->parent();
   }
   NOTREACHED();
 #endif
   return false;
 }
 
-bool ChromeContentRendererClient::ShouldFork(WebFrame* frame,
+bool ChromeContentRendererClient::ShouldFork(blink::WebFrame* frame,
                                              const GURL& url,
                                              const std::string& http_method,
                                              bool is_initial_navigation,
                                              bool is_server_redirect,
                                              bool* send_referrer) {
   DCHECK(!frame->parent());
 
   // If this is the Instant process, fork all navigations originating from the
   // renderer.  The destination page will then be bucketed back to this Instant
   // process if it is an Instant url, or to another process if not.  Conversely,
@@ skipping 121 matching lines @@
     if (url.host() == chrome::kChromeUIThumbnailHost)
       return search_box->GenerateThumbnailURLFromTransientURL(url, new_url);
     else if (url.host() == chrome::kChromeUIFaviconHost)
       return search_box->GenerateFaviconURLFromTransientURL(url, new_url);
   }
 
   return false;
 }
 
 void ChromeContentRendererClient::DidCreateScriptContext(
-    WebFrame* frame, v8::Handle<v8::Context> context, int extension_group,
+    blink::WebLocalFrame* frame,
+    v8::Handle<v8::Context> context,
+    int extension_group,
     int world_id) {
 #if defined(ENABLE_EXTENSIONS)
   extension_dispatcher_->DidCreateScriptContext(
       frame, context, extension_group, world_id);
 #endif
 }
 
 unsigned long long ChromeContentRendererClient::VisitedLinkHash(
     const char* canonical_url, size_t length) {
   return visited_link_slave_->ComputeURLFingerprint(canonical_url, length);
@@ skipping 26 matching lines @@
       new extensions::RendererPermissionsPolicyDelegate(
           extension_dispatcher_.get()));
 }
 
 extensions::Dispatcher*
 ChromeContentRendererClient::GetExtensionDispatcherForTest() {
   return extension_dispatcher_.get();
 }
 
 bool ChromeContentRendererClient::CrossesExtensionExtents(
-    WebFrame* frame,
+    blink::WebFrame* frame,
     const GURL& new_url,
     const extensions::ExtensionSet& extensions,
     bool is_extension_url,
     bool is_initial_navigation) {
   GURL old_url(frame->top()->document().url());
 
   // If old_url is still empty and this is an initial navigation, then this is
   // a window.open operation.  We should look at the opener URL.
   if (is_initial_navigation && old_url.is_empty() && frame->opener()) {
     // If we're about to open a normal web page from a same-origin opener stuck
@@ skipping 201 matching lines @@
   if (mime_type == content::kBrowserPluginMimeType) {
     return new extensions::ExtensionsGuestViewContainer(render_frame);
   } else {
     return new extensions::MimeHandlerViewContainer(
         render_frame, mime_type, original_url);
   }
 #else
   return NULL;
 #endif
 }