Move ShellWindow into apps component.

chrome/browser/extensions/platform_app_browsertest_util.h

Index: chrome/browser/extensions/platform_app_browsertest_util.h
diff --git a/chrome/browser/extensions/platform_app_browsertest_util.h b/chrome/browser/extensions/platform_app_browsertest_util.h
index d4849096dd5056d8de41e0ce77274fe2a61a1889..3a5bec51139d58c20020e6272392cb5998892d20 100644
--- a/chrome/browser/extensions/platform_app_browsertest_util.h
+++ b/chrome/browser/extensions/platform_app_browsertest_util.h
@@ -6,15 +6,14 @@
 #define CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_
 
 
+#include "apps/shell_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/ui/extensions/shell_window.h"
 
 namespace content {
 class WebContents;
 }
 
 class CommandLine;
-class ShellWindow;
 
 namespace extensions {
 class Extension;
@@ -41,7 +40,7 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
 
   // Gets the first shell window that is found (most tests only deal with one
   // platform app window, so this is good enough).
-  ShellWindow* GetFirstShellWindow();
+  apps::ShellWindow* GetFirstShellWindow();
 
   // Runs chrome.windows.getAll for the given extension and returns the number
   // of windows that the function returns.
@@ -64,13 +63,14 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
   void SetCommandLineArg(const std::string& test_file);
 
   // Creates an empty shell window for |extension|.
-  ShellWindow* CreateShellWindow(const Extension* extension);
+  apps::ShellWindow* CreateShellWindow(const Extension* extension);
 
-  ShellWindow* CreateShellWindowFromParams(
-      const Extension* extension, const ShellWindow::CreateParams& params);
+  apps::ShellWindow* CreateShellWindowFromParams(
+      const Extension* extension,
+      const apps::ShellWindow::CreateParams& params);
 
   // Closes |window| and waits until it's gone.
-  void CloseShellWindow(ShellWindow* window);
+  void CloseShellWindow(apps::ShellWindow* window);
 };
 
 class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest {
@@ -78,6 +78,6 @@ class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest {
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 };
 
-}
+}  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_