Improvements to fatal JavaScript extension errors: (1) include the extension

chrome/renderer/extensions/dispatcher.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/extensions/dispatcher.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/json/json_reader.h"
@@ skipping 286 matching lines @@
                    base::Unretained(this)));
     RouteFunction("InIncognitoContext",
         base::Bind(&ProcessInfoNativeHandler::InIncognitoContext,
                    base::Unretained(this)));
     RouteFunction("GetManifestVersion",
         base::Bind(&ProcessInfoNativeHandler::GetManifestVersion,
                    base::Unretained(this)));
     RouteFunction("IsSendRequestDisabled",
         base::Bind(&ProcessInfoNativeHandler::IsSendRequestDisabled,
                    base::Unretained(this)));
+    RouteFunction("HasSwitch",
+        base::Bind(&ProcessInfoNativeHandler::HasSwitch,
+                   base::Unretained(this)));
   }
 
+ private:
   void GetExtensionId(const v8::FunctionCallbackInfo<v8::Value>& args) {
     args.GetReturnValue().Set(v8::String::New(extension_id_.c_str()));
   }
 
   void GetContextType(const v8::FunctionCallbackInfo<v8::Value>& args) {
     args.GetReturnValue().Set(v8::String::New(context_type_.c_str()));
   }
 
   void InIncognitoContext(const v8::FunctionCallbackInfo<v8::Value>& args) {
     args.GetReturnValue().Set(is_incognito_context_);
   }
 
   void GetManifestVersion(const v8::FunctionCallbackInfo<v8::Value>& args) {
     args.GetReturnValue().Set(static_cast<int32_t>(manifest_version_));
   }
 
   void IsSendRequestDisabled(const v8::FunctionCallbackInfo<v8::Value>& args) {
     if (send_request_disabled_) {
       args.GetReturnValue().Set(v8::String::New(
           "sendRequest and onRequest are obsolete."
           " Please use sendMessage and onMessage instead."));
     }
   }
 
- private:
+  void HasSwitch(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    CHECK(args.Length() == 1 && args[0]->IsString());
+    bool has_switch = CommandLine::ForCurrentProcess()->HasSwitch(
+        *v8::String::AsciiValue(args[0]));
+    args.GetReturnValue().Set(v8::Boolean::New(has_switch));
+  }
+
   std::string extension_id_;
   std::string context_type_;
   bool is_incognito_context_;
   int manifest_version_;
   bool send_request_disabled_;
 };
 
 void InstallAppBindings(ModuleSystem* module_system,
                         v8::Handle<v8::Object> chrome) {
   module_system->SetLazyField(chrome, "app", "app", "chromeApp");
@@ skipping 620 matching lines @@
 
   // Platform app sources that are not API-specific..
   source_map_.RegisterSource("tagWatcher", IDR_TAG_WATCHER_JS);
   // Note: webView not webview so that this doesn't interfere with the
   // chrome.webview API bindings.
   source_map_.RegisterSource("webView", IDR_WEB_VIEW_JS);
   source_map_.RegisterSource("webViewExperimental",
                              IDR_WEB_VIEW_EXPERIMENTAL_JS);
   source_map_.RegisterSource("denyWebView", IDR_WEB_VIEW_DENY_JS);
   source_map_.RegisterSource("adView", IDR_AD_VIEW_JS);
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableAdviewSrcAttribute)) {
-    source_map_.RegisterSource("adViewCustom", IDR_AD_VIEW_CUSTOM_JS);
-  }
   source_map_.RegisterSource("denyAdView", IDR_AD_VIEW_DENY_JS);
   source_map_.RegisterSource("platformApp", IDR_PLATFORM_APP_JS);
   source_map_.RegisterSource("injectAppTitlebar", IDR_INJECT_APP_TITLEBAR_JS);
 }
 
 void Dispatcher::PopulateLazyBindingsMap() {
   lazy_bindings_map_["app"] = InstallAppBindings;
   lazy_bindings_map_["webstore"] = InstallWebstoreBindings;
 }
 
@@ skipping 119 matching lines @@
     } else {
       module_system->Require("denyWebView");
     }
   }
 
   // Same comment as above for <adview> tag.
   if (context_type == Feature::BLESSED_EXTENSION_CONTEXT &&
       is_within_platform_app) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAdview)) {
       if (extension->HasAPIPermission(APIPermission::kAdView)) {
-        if (CommandLine::ForCurrentProcess()->HasSwitch(
-                switches::kEnableAdviewSrcAttribute)) {
-          module_system->Require("adViewCustom");
-        }
         module_system->Require("adView");
       } else {
         module_system->Require("denyAdView");
       }
     }
   }
 
   VLOG(1) << "Num tracked contexts: " << v8_context_set_.size();
 }
 
@@ skipping 374 matching lines @@
     RenderView* background_view =
         ExtensionHelper::GetBackgroundPage(extension_id);
     if (background_view) {
       background_view->Send(new ExtensionHostMsg_EventAck(
           background_view->GetRoutingID()));
     }
   }
 }
 
 }  // namespace extensions