[Extensions] Clean up the handling of ExtensionHostMsg_Request

chrome/browser/extensions/chrome_extension_function_details.cc

 // 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.
 
 #include "chrome/browser/extensions/chrome_extension_function_details.h"
 
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 36 matching lines @@
 
   return GetProfile()->HasOffTheRecordProfile() &&
          GetProfile()->GetOffTheRecordProfile() == window_controller->profile();
 }
 
 // TODO(stevenjb): Replace this with GetExtensionWindowController().
 Browser* ChromeExtensionFunctionDetails::GetCurrentBrowser() const {
   // If the delegate has an associated browser, return it.
   if (function_->dispatcher()) {
     extensions::WindowController* window_controller =
-        function_->dispatcher()->delegate()->GetExtensionWindowController();
+        function_->dispatcher()->GetExtensionWindowController();

[not at google - send to devlin, 2015/06/10 20:48:12]

It would be nice if this were just function_->GetWindowController() (likewise
GetVisibleWebContents), and the dispatcher() accessor on ExtensionFunction
entirely removed. But, not necessarily right now.

[Devlin, 2015/06/10 20:59:20]

Agreed - I intend to try and clean up ExtensionFunction's dependence on
Dispatcher at some point, but that's a later patch.

     if (window_controller) {
       Browser* browser = window_controller->GetBrowser();
       if (browser)
         return browser;
     }
   }
 
   // Otherwise, try to default to a reasonable browser. If |include_incognito_|
   // is true, we will also search browsers in the incognito version of this
   // profile. Note that the profile may already be incognito, in which case
@@ skipping 18 matching lines @@
   // TODO(rafaelw): Delay creation of background_page until the browser
   // is available. http://code.google.com/p/chromium/issues/detail?id=13284
   return NULL;
 }
 
 extensions::WindowController*
 ChromeExtensionFunctionDetails::GetExtensionWindowController() const {
   // If the delegate has an associated window controller, return it.
   if (function_->dispatcher()) {
     extensions::WindowController* window_controller =
-        function_->dispatcher()->delegate()->GetExtensionWindowController();
+        function_->dispatcher()->GetExtensionWindowController();
     if (window_controller)
       return window_controller;
   }
 
   return extensions::WindowControllerList::GetInstance()
       ->CurrentWindowForFunction(*this);
 }
 
 content::WebContents*
 ChromeExtensionFunctionDetails::GetAssociatedWebContents() {
   content::WebContents* web_contents = function_->GetAssociatedWebContents();
   if (web_contents)
     return web_contents;
 
   Browser* browser = GetCurrentBrowser();
   if (!browser)
     return NULL;
   return browser->tab_strip_model()->GetActiveWebContents();
 }