Move ExtensionWindowController and related into extensions namespace

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 6b050cca2793baf9b1c783108cb3a8138f40ca34..0698d3bcbc609a373848990bed87a7901045514d 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -26,7 +26,6 @@ class Browser;
 class ChromeRenderMessageFilter;
 class ExtensionFunction;
 class ExtensionFunctionDispatcher;
-class ExtensionWindowController;
 class UIThreadExtensionFunction;
 class IOThreadExtensionFunction;
 class Profile;
@@ -41,6 +40,10 @@ namespace content {
 class RenderViewHost;
 }
 
+namespace extensions {
+class WindowController;
+}
+
 #define EXTENSION_FUNCTION_VALIDATE(test) do { \
     if (!(test)) { \
       bad_message_ = true; \
@@ -286,13 +289,13 @@ class UIThreadExtensionFunction : public ExtensionFunction {
   // TODO(stevenjb): Replace this with GetExtensionWindowController().
   Browser* GetCurrentBrowser();
 
-  // Same as above but uses ExtensionWindowList instead of BrowserList.
-  ExtensionWindowController* GetExtensionWindowController();
+  // Same as above but uses WindowControllerList instead of BrowserList.
+  extensions::WindowController* GetExtensionWindowController();
 
   // Returns true if this function (and the profile and extension that it was
   // invoked from) can operate on the window wrapped by |window_controller|.
   bool CanOperateOnWindow(
-      const ExtensionWindowController* window_controller) const;
+      const extensions::WindowController* window_controller) const;
 
  protected:
   friend struct content::BrowserThread::DeleteOnThread<