"Redirecting URLs to Packaged Apps" implementation: revised

chrome/browser/apps/app_browsertest_util.h

 // Copyright 2013 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_APPS_APP_BROWSERTEST_UTIL_H_
 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_
 
 
 #include "apps/shell_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 11 matching lines @@
  public:
   PlatformAppBrowserTest();
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
  protected:
   // Runs the app named |name| out of the platform_apps subdirectory. Waits
   // until it is launched.
   const Extension* LoadAndLaunchPlatformApp(const char* name);
 
+  // Installs the app named |name| out of the platform_apps subdirectory.
+  const Extension* InstallPlatformApp(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
   // enough).
   content::WebContents* GetFirstShellWindowWebContents();
 
   // Gets the first shell window that is found (most tests only deal with one
@@ skipping 38 matching lines @@
       const gfx::Rect& current_screen_bounds,
       const gfx::Size& minimum_size,
       gfx::Rect* bounds);
 };
 
 class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 };
 
+class PlatformAppUrlRedirectorBrowserTest : public PlatformAppBrowserTest {

[benwells, 2013/09/09 05:48:39]

Is there a reason this class is in this module? It would normally go in the file
that defines the tests, unless it is used in multiple test files.

[sergeygs, 2013/09/09 09:55:36]

No real reason, it just seemed to make sense. Moved. 

+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+
+ protected:
+  void TestNavigationInTab(const char* launcher_page_path,
+                           const char* handler_path,
+                           const char* handler_ack,
+                           size_t expected_shell_window_count);
+  void TestNavigationInApp(const char* launcher_path,
+                           const char* launcher_ack,
+                           const char* handler_path,
+                           const char* handler_ack,
+                           size_t expected_shell_window_count);
+};
+
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_