Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

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 <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 122 matching lines @@
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 using WebKit::WebVector;
 
 namespace {
 
 const char kWebViewTagName[] = "WEBVIEW";
 const char kAdViewTagName[] = "ADVIEW";
 
+chrome::ChromeContentRendererClient* g_current_client;
+
 // Explicitly register all extension ManifestHandlers needed to parse
 // fields used in the renderer.
 void RegisterExtensionManifestHandlers() {
   (new extensions::AppIsolationHandler)->Register();
   (new extensions::BackgroundManifestHandler)->Register();
   (new extensions::CSPHandler(false))->Register();  // not platform app.
   (new extensions::CSPHandler(true))->Register();  // platform app.
   (new extensions::DevToolsPageHandler)->Register();
   (new extensions::IncognitoHandler)->Register();
   (new extensions::PageActionHandler)->Register();
@@ skipping 75 matching lines @@
   if (!webview)
     return NULL;
   return content::RenderView::FromWebView(webview);
 }
 
 }  // namespace
 
 namespace chrome {
 
 ChromeContentRendererClient::ChromeContentRendererClient() {
+  g_current_client = this;
 }
 
 ChromeContentRendererClient::~ChromeContentRendererClient() {
+  g_current_client = NULL;
 }
 
 void ChromeContentRendererClient::RenderThreadStarted() {
   chrome_observer_.reset(new ChromeRenderProcessObserver(this));
   extension_dispatcher_.reset(new extensions::Dispatcher());
   net_predictor_.reset(new RendererNetPredictor());
   spellcheck_.reset(new SpellCheck());
   visited_link_slave_.reset(new components::VisitedLinkSlave());
 #if defined(FULL_SAFE_BROWSING)
   phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create());
@@ skipping 340 matching lines @@
               switches::kEnableNaCl);
         } else {
           // If this is an external plugin that handles the NaCl mime type, we
           // allow Native Client, so Native Client's integration tests work.
           is_nacl_unrestricted = true;
         }
         if (is_nacl_plugin || is_nacl_mime_type) {
           GURL manifest_url = is_nacl_mime_type ?
               url : GetNaClContentHandlerURL(actual_mime_type, plugin);
           const Extension* extension =
-              extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
-                  ExtensionURLInfo(manifest_url));
+              g_current_client->extension_dispatcher_->extensions()->
+                  GetExtensionOrAppByURL(ExtensionURLInfo(manifest_url));
           GURL top_url = frame->top()->document().url();
           if (!IsNaClAllowed(manifest_url,
                              top_url,
                              is_nacl_unrestricted,
                              extension,
                              &params)) {
             frame->addMessageToConsole(
                 WebConsoleMessage(
                     WebConsoleMessage::LevelError,
                     "Only unpacked extensions and apps installed from the "
@@ skipping 530 matching lines @@
   if (thread)
     thread->AddObserver(spellcheck_.get());
 }
 
 void ChromeContentRendererClient::OnPurgeMemory() {
   DVLOG(1) << "Resetting spellcheck in renderer client";
   SetSpellcheck(new SpellCheck());
 }
 
 bool ChromeContentRendererClient::IsAdblockInstalled() {
-  return extension_dispatcher_->extensions()->Contains(
+  return g_current_client->extension_dispatcher_->extensions()->Contains(
       "gighmmpiobklfepjocnamgkkbiglidom");
 }
 
 bool ChromeContentRendererClient::IsAdblockPlusInstalled() {
-  return extension_dispatcher_->extensions()->Contains(
+  return g_current_client->extension_dispatcher_->extensions()->Contains(
       "cfhdojbkjhnklbpkdaibdccddilifddb");
 }
 
 bool ChromeContentRendererClient::IsAdblockWithWebRequestInstalled() {
-  return extension_dispatcher_->IsAdblockWithWebRequestInstalled();
+  return g_current_client->extension_dispatcher_->
+      IsAdblockWithWebRequestInstalled();
 }
 
 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() {
-  return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled();
+  return g_current_client->extension_dispatcher_->
+      IsAdblockPlusWithWebRequestInstalled();
 }
 
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
-  return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
+  return g_current_client->extension_dispatcher_->
+      IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
 #if defined(ENABLE_PLUGINS)
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 #endif
 }
 
 bool ChromeContentRendererClient::AllowBrowserPlugin(
@@ skipping 51 matching lines @@
 
   for (size_t i = 0; i < request_os_file_handle_allowed_hosts_.size(); ++i) {
     if (MatchPattern(inner.host(), request_os_file_handle_allowed_hosts_[i]))
       return true;
   }
 
   return false;
 }
 
 }  // namespace chrome