Revert 170660

chrome/browser/extensions/platform_app_browsertest_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_
 
 
 #include "chrome/browser/extensions/extension_apitest.h"
 
 
 namespace content {
 class WebContents;
 }
 
 class CommandLine;
 class ShellWindow;
 
 namespace extensions {
 class Extension;
 
-// TODO(benwells): Clean up this test hierarchy.
-// - rename this to PlatformAppApiTest
-// - remove the existing PlatformAppApiTest
-// - Move the CloseWindow* functions from ExtensionBrowserTest to here
-// - Move the RunPlatformAppTest functions from ExtensionApiTest to here
-// - Make all platform app tests use this class.
 class PlatformAppBrowserTest : public ExtensionApiTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
  protected:
-  // Loads the app named |name| out of the platform_apps subdirectory.
-  const Extension* LoadPlatformApp(const char* name);
-
-  // Installs the app named |name| out of the platform_apps subdirectory.
-  const Extension* InstallPlatformApp(const char* name);
-
   // Runs the app named |name| out of the platform_apps subdirectory. Waits
   // until it is launched.
   const Extension* LoadAndLaunchPlatformApp(const char* name);
 
   // Installs and runs the app named |name| out of the platform_apps
   // subdirectory. Waits until it is launched.
   const Extension* InstallAndLaunchPlatformApp(const char* name);
 
   // Gets the WebContents associated with the first shell window that is found
   // (most tests only deal with one platform app window, so this is good
@@ skipping 19 matching lines @@
   // The command line already has an argument on it - about:blank, which
   // is set by InProcessBrowserTest::PrepareTestCommandLine. For platform app
   // launch tests we need to clear this.
   void ClearCommandLineArgs();
 
   // Sets up the command line for running platform apps.
   void SetCommandLineArg(const std::string& test_file);
 
   // Creates an empty shell window for |extension|.
   ShellWindow* CreateShellWindow(const Extension* extension);
+
+  // Closes |window| and waits until it's gone.
+  void CloseShellWindow(ShellWindow* window);
 };
 
 }
 
 #endif  // CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_