[Extensions] Clean up the handling of ExtensionHostMsg_Request

extensions/browser/extension_function_dispatcher.h

 // Copyright 2014 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.
 
 #ifndef EXTENSIONS_BROWSER_EXTENSION_FUNCTION_DISPATCHER_H_
 #define EXTENSIONS_BROWSER_EXTENSION_FUNCTION_DISPATCHER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 72 matching lines @@
   // functions that must be handled on the IO-thread.
   static void DispatchOnIOThread(
       InfoMap* extension_info_map,
       void* profile_id,
       int render_process_id,
       base::WeakPtr<IOThreadExtensionMessageFilter> ipc_sender,
       int routing_id,
       const ExtensionHostMsg_Request_Params& params);
 
   // Public constructor. Callers must ensure that:
-  // - |delegate| outlives this object.
   // - This object outlives any RenderViewHost's passed to created
   //   ExtensionFunctions.
-  ExtensionFunctionDispatcher(content::BrowserContext* browser_context,
-                              Delegate* delegate);
-
+  explicit ExtensionFunctionDispatcher(
+      content::BrowserContext* browser_context);
   ~ExtensionFunctionDispatcher();
 
-  Delegate* delegate() { return delegate_; }
-
   // Message handlers.
   // The response is sent to the corresponding render view in an
   // ExtensionMsg_Response message.
   // TODO (jam): convert all callers to use RenderFrameHost.
   void Dispatch(const ExtensionHostMsg_Request_Params& params,
                 content::RenderViewHost* render_view_host);
 
   // Called when an ExtensionFunction is done executing, after it has sent
   // a response (if any) to the extension.
   void OnExtensionFunctionCompleted(const Extension* extension);
 
+  // See the Delegate class for documentation on these methods.
+  // TODO(devlin): None of these belong here. We should kill
+  // ExtensionFunctionDispatcher::Delegate.
+  WindowController* GetExtensionWindowController() const;
+  content::WebContents* GetAssociatedWebContents() const;
+  content::WebContents* GetVisibleWebContents() const;
+
   // The BrowserContext that this dispatcher is associated with.
   content::BrowserContext* browser_context() { return browser_context_; }
 
+  void set_delegate(Delegate* delegate) { delegate_ = delegate; }
+
  private:
   // For a given RenderViewHost instance, UIThreadResponseCallbackWrapper
   // creates ExtensionFunction::ResponseCallback instances which send responses
   // to the corresponding render view in ExtensionMsg_Response messages.
   // This class tracks the lifespan of the RenderViewHost instance, and will be
   // destroyed automatically when it goes away.
   class UIThreadResponseCallbackWrapper;
 
   // Helper to check whether an ExtensionFunction has the required permissions.
   // This should be called after the function is fully initialized.
@@ skipping 36 matching lines @@
   // instance goes away, the corresponding entry in this map (if exists) will be
   // removed.
   typedef std::map<content::RenderViewHost*, UIThreadResponseCallbackWrapper*>
       UIThreadResponseCallbackWrapperMap;
   UIThreadResponseCallbackWrapperMap ui_thread_response_callback_wrappers_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EXTENSION_FUNCTION_DISPATCHER_H_