Move AppWindow to extensions

chrome/browser/apps/app_browsertest_util.h

Index: chrome/browser/apps/app_browsertest_util.h
diff --git a/chrome/browser/apps/app_browsertest_util.h b/chrome/browser/apps/app_browsertest_util.h
index 50676ab93b53b4677d719fff78572e521a290f3c..ad1ebd779717bb28b5e4dde02cd833bcf22ab575 100644
--- a/chrome/browser/apps/app_browsertest_util.h
+++ b/chrome/browser/apps/app_browsertest_util.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_
 
-#include "apps/app_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "content/public/common/page_transition_types.h"
+#include "extensions/browser/app_window/app_window.h"
 
 namespace base {
 class CommandLine;
@@ -30,7 +30,7 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
 
   // Gets the first app window that is found for a given browser.
-  static apps::AppWindow* GetFirstAppWindowForBrowser(Browser* browser);
+  static AppWindow* GetFirstAppWindowForBrowser(Browser* browser);
 
  protected:
   // Runs the app named |name| out of the platform_apps subdirectory. Waits
@@ -61,10 +61,10 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
 
   // Gets the first app window that is found (most tests only deal with one
   // platform app window, so this is good enough).
-  apps::AppWindow* GetFirstAppWindow();
+  AppWindow* GetFirstAppWindow();
 
   // Gets the first app window for an app.
-  apps::AppWindow* GetFirstAppWindowForApp(const std::string& app_id);
+  AppWindow* GetFirstAppWindowForApp(const std::string& app_id);
 
   // Runs chrome.windows.getAll for the given extension and returns the number
   // of windows that the function returns.
@@ -90,18 +90,17 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
   void SetCommandLineArg(const std::string& test_file);
 
   // Creates an empty app window for |extension|.
-  apps::AppWindow* CreateAppWindow(const Extension* extension);
+  AppWindow* CreateAppWindow(const Extension* extension);
 
-  apps::AppWindow* CreateAppWindowFromParams(
-      const Extension* extension,
-      const apps::AppWindow::CreateParams& params);
+  AppWindow* CreateAppWindowFromParams(const Extension* extension,
+                                       const AppWindow::CreateParams& params);
 
   // Closes |window| and waits until it's gone.
-  void CloseAppWindow(apps::AppWindow* window);
+  void CloseAppWindow(AppWindow* window);
 
   // Call AdjustBoundsToBeVisibleOnScreen of |window|.
   void CallAdjustBoundsToBeVisibleOnScreenForAppWindow(
-      apps::AppWindow* window,
+      AppWindow* window,
       const gfx::Rect& cached_bounds,
       const gfx::Rect& cached_screen_bounds,
       const gfx::Rect& current_screen_bounds,
@@ -112,8 +111,7 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
   // the caller in order to terminate the test - use CloseAppWindow().
   // |window_create_options| are the options that will be passed to
   // chrome.app.window.create() in the test app.
-  apps::AppWindow* CreateTestAppWindow(
-      const std::string& window_create_options);
+  AppWindow* CreateTestAppWindow(const std::string& window_create_options);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PlatformAppBrowserTest);