[Extensions] Clean up the handling of ExtensionHostMsg_Request

chrome/browser/extensions/chrome_extension_function.cc

 // Copyright 2013 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.h"
 
 #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"
@@ skipping 30 matching lines @@
 
   return GetProfile()->HasOffTheRecordProfile() &&
          GetProfile()->GetOffTheRecordProfile() == window_controller->profile();
 }
 
 // TODO(stevenjb): Replace this with GetExtensionWindowController().
 Browser* ChromeUIThreadExtensionFunction::GetCurrentBrowser() {
   // If the delegate has an associated browser, return it.
   if (dispatcher()) {
     extensions::WindowController* window_controller =
-        dispatcher()->delegate()->GetExtensionWindowController();
+        dispatcher()->GetExtensionWindowController();
     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*
 ChromeUIThreadExtensionFunction::GetExtensionWindowController() {
   // If the delegate has an associated window controller, return it.
   if (dispatcher()) {
     extensions::WindowController* window_controller =
-        dispatcher()->delegate()->GetExtensionWindowController();
+        dispatcher()->GetExtensionWindowController();
     if (window_controller)
       return window_controller;
   }
 
   return extensions::WindowControllerList::GetInstance()
       ->CurrentWindowForFunction(ChromeExtensionFunctionDetails(this));
 }
 
 content::WebContents*
 ChromeUIThreadExtensionFunction::GetAssociatedWebContents() {
@@ skipping 33 matching lines @@
 
 ExtensionFunction::ResponseAction ChromeSyncExtensionFunction::Run() {
   return RespondNow(RunSync() ? ArgumentList(results_.Pass()) : Error(error_));
 }
 
 // static
 bool ChromeSyncExtensionFunction::ValidationFailure(
     ChromeSyncExtensionFunction* function) {
   return false;
 }