Rolling back change 22245.

chrome/browser/extensions/extension_function_dispatcher.cc

Index: chrome/browser/extensions/extension_function_dispatcher.cc
===================================================================
--- chrome/browser/extensions/extension_function_dispatcher.cc	(revision 22246)
+++ chrome/browser/extensions/extension_function_dispatcher.cc	(working copy)
@@ -16,12 +16,10 @@
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
-#include "chrome/browser/extensions/extension_toolstrip_api.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/result_codes.h"
-#include "chrome/common/url_constants.h"
 
 // FactoryRegistry -------------------------------------------------------------
 
@@ -69,7 +67,6 @@
   namespace tabs = extension_tabs_module_constants;
   namespace page_actions = extension_page_actions_module_constants;
   namespace bookmarks = extension_bookmarks_module_constants;
-  namespace toolstrip = extension_toolstrip_api_functions;
 
   // Windows
   factories_[tabs::kGetWindowFunction] =
@@ -130,12 +127,6 @@
       &NewExtensionFunction<MoveBookmarkFunction>;
   factories_[bookmarks::kSetBookmarkTitleFunction] =
       &NewExtensionFunction<SetBookmarkTitleFunction>;
-
-  // Toolstrips.
-  factories_[toolstrip::kExpandFunction] =
-      &NewExtensionFunction<ToolstripExpandFunction>;
-  factories_[toolstrip::kCollapseFunction] =
-      &NewExtensionFunction<ToolstripCollapseFunction>;
 }
 
 void FactoryRegistry::GetAllNames(std::vector<std::string>* names) {
@@ -196,10 +187,6 @@
     delegate_(delegate),
     url_(url),
     ALLOW_THIS_IN_INITIALIZER_LIST(peer_(new Peer(this))) {
-  // TODO(erikkay) should we do something for these errors in Release?
-  DCHECK(url.SchemeIs(chrome::kExtensionScheme));
-  DCHECK(profile()->GetExtensionsService()->GetExtensionByURL(url));
-
   all_instances()->insert(this);
 
   // Notify the ExtensionProcessManager that the view was created.
@@ -220,11 +207,6 @@
   return retval;
 }
 
-ExtensionHost* ExtensionFunctionDispatcher::GetExtensionHost() {
-  DCHECK(delegate_);
-  return delegate_->GetExtensionHost();
-}
-
 void ExtensionFunctionDispatcher::HandleRequest(const std::string& name,
                                                 const std::string& args,
                                                 int request_id,