Rolling back change 22245.

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2006-2009 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/browser/extensions/extension_host.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/url_constants.h"
 
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 #include "webkit/glue/context_menu.h"
 
 namespace {
 
 class CrashedExtensionInfobarDelegate : public ConfirmInfoBarDelegate {
@@ skipping 147 matching lines @@
 void ExtensionHost::DidNavigate(RenderViewHost* render_view_host,
     const ViewHostMsg_FrameNavigate_Params& params) {
   // We only care when the outer frame changes.
   switch (params.transition) {
     case PageTransition::AUTO_SUBFRAME:
     case PageTransition::MANUAL_SUBFRAME:
       return;
   }
 
   url_ = params.url;
-  if (!url_.SchemeIs(chrome::kExtensionScheme)) {
-    extension_function_dispatcher_.reset(NULL);
-    return;
-  }
   extension_function_dispatcher_.reset(
       new ExtensionFunctionDispatcher(render_view_host_, this, url_));
 }
 
 void ExtensionHost::DidStopLoading(RenderViewHost* render_view_host) {
 #if defined(TOOLKIT_VIEWS)
   ExtensionView* view = view_.get();
   if (view) {
     // TODO(erikkay) this injection should really happen in the renderer.
     // When the Jerry's view type change lands, investigate moving this there.
@@ skipping 31 matching lines @@
 WebPreferences ExtensionHost::GetWebkitPrefs() {
   PrefService* prefs = render_view_host()->process()->profile()->GetPrefs();
   const bool kIsDomUI = true;
   return RenderViewHostDelegateHelper::GetWebkitPrefs(prefs, kIsDomUI);
 }
 
 void ExtensionHost::ProcessDOMUIMessage(const std::string& message,
                                         const std::string& content,
                                         int request_id,
                                         bool has_callback) {
-  if (extension_function_dispatcher_.get()) {
-    extension_function_dispatcher_->HandleRequest(message, content, request_id,
-                                                  has_callback);
-  }
+  extension_function_dispatcher_->HandleRequest(message, content, request_id,
+                                                has_callback);
 }
 
 void ExtensionHost::DidInsertCSS() {
 #if defined(TOOLKIT_VIEWS)
   if (view_.get())
     view_->SetDidInsertCSS(true);
 #endif
 }
 
 RenderViewHostDelegate::View* ExtensionHost::GetViewDelegate() {
@@ skipping 87 matching lines @@
   // a toolstrip or background_page onload chrome.tabs api call can make it
   // into here before the browser is sufficiently initialized to return here.
   // A similar situation may arise during shutdown.
   // TODO(rafaelw): Delay creation of background_page until the browser
   // is available. http://code.google.com/p/chromium/issues/detail?id=13284
   return browser;
 }
 
 void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
 }