Remove Browser dependency in ExtensionFunctionDispatcher

chrome/browser/extensions/extension_function.h

Index: chrome/browser/extensions/extension_function.h
diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index 0f9a6fa59e130356a5e3e705c858d94b63ff3128..d943a31be6fef6ed833f1c5847149592d523688d 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -27,6 +27,7 @@ class Browser;
 class ChromeRenderMessageFilter;
 class ExtensionFunction;
 class ExtensionFunctionDispatcher;
+class ExtensionWindowController;
 class UIThreadExtensionFunction;
 class IOThreadExtensionFunction;
 class Profile;
@@ -277,8 +278,13 @@ class UIThreadExtensionFunction : public ExtensionFunction {
   // This method can return NULL if there is no matching browser, which can
   // happen if only incognito windows are open, or early in startup or shutdown
   // shutdown when there are no active windows.
+  //
+  // TODO(stevenjb): Replace this with GetExtensionWindowController().
   Browser* GetCurrentBrowser();
 
+  // Same as above but uses ExtensionWindowList instead of BrowserList.
+  ExtensionWindowController* GetExtensionWindowController();
+
  protected:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;