Rename apps::ShellWindow to apps::AppWindow

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 e322fc039019a834358709c7909aa1f3e4c8a60b..41e883fd39aadfbdf702c1a313fb69fc461d18d6 100644
--- a/chrome/browser/apps/app_browsertest_util.h
+++ b/chrome/browser/apps/app_browsertest_util.h
@@ -5,8 +5,7 @@
 #ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_
 
-
-#include "apps/shell_window.h"
+#include "apps/app_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "content/public/common/page_transition_types.h"
 
@@ -26,8 +25,8 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
-  // Gets the first shell window that is found for a given browser.
-  static apps::ShellWindow* GetFirstShellWindowForBrowser(Browser* browser);
+  // Gets the first app window that is found for a given browser.
+  static apps::AppWindow* GetFirstAppWindowForBrowser(Browser* browser);
 
  protected:
   // Runs the app named |name| out of the platform_apps subdirectory. Waits
@@ -44,17 +43,17 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
   // Launch the given platform app.
   void LaunchPlatformApp(const Extension* extension);
 
-  // Gets the WebContents associated with the first shell window that is found
+  // Gets the WebContents associated with the first app window that is found
   // (most tests only deal with one platform app window, so this is good
   // enough).
-  content::WebContents* GetFirstShellWindowWebContents();
+  content::WebContents* GetFirstAppWindowWebContents();
 
-  // Gets the first shell window that is found (most tests only deal with one
+  // Gets the first app window that is found (most tests only deal with one
   // platform app window, so this is good enough).
-  apps::ShellWindow* GetFirstShellWindow();
+  apps::AppWindow* GetFirstAppWindow();
 
-  // Gets the first shell window for an app.
-  apps::ShellWindow* GetFirstShellWindowForApp(const std::string& app_id);
+  // Gets the first app window for an app.
+  apps::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.
@@ -65,11 +64,11 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
   bool RunGetWindowFunctionForExtension(int window_id,
                                         const Extension* extension);
 
-  // Returns the number of shell windows.
-  size_t GetShellWindowCount();
+  // Returns the number of app windows.
+  size_t GetAppWindowCount();
 
-  // Returns the number of shell windows for a specific app.
-  size_t GetShellWindowCountForApp(const std::string& app_id);
+  // Returns the number of app windows for a specific app.
+  size_t GetAppWindowCountForApp(const std::string& app_id);
 
   // The command line already has an argument on it - about:blank, which
   // is set by InProcessBrowserTest::PrepareTestCommandLine. For platform app
@@ -79,19 +78,19 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
   // Sets up the command line for running platform apps.
   void SetCommandLineArg(const std::string& test_file);
 
-  // Creates an empty shell window for |extension|.
-  apps::ShellWindow* CreateShellWindow(const Extension* extension);
+  // Creates an empty app window for |extension|.
+  apps::AppWindow* CreateAppWindow(const Extension* extension);
 
-  apps::ShellWindow* CreateShellWindowFromParams(
+  apps::AppWindow* CreateAppWindowFromParams(
       const Extension* extension,
-      const apps::ShellWindow::CreateParams& params);
+      const apps::AppWindow::CreateParams& params);
 
   // Closes |window| and waits until it's gone.
-  void CloseShellWindow(apps::ShellWindow* window);
+  void CloseAppWindow(apps::AppWindow* window);
 
   // Call AdjustBoundsToBeVisibleOnScreen of |window|.
-  void CallAdjustBoundsToBeVisibleOnScreenForShellWindow(
-      apps::ShellWindow* window,
+  void CallAdjustBoundsToBeVisibleOnScreenForAppWindow(
+      apps::AppWindow* window,
       const gfx::Rect& cached_bounds,
       const gfx::Rect& cached_screen_bounds,
       const gfx::Rect& current_screen_bounds,