Added a test to make sure the app store redirect issue (see bug) doesn't

chrome/browser/extensions/app_process_apitest.cc

 // Copyright (c) 2010 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.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 43 matching lines @@
       L"window.location = '" + UTF8ToWide(url.spec()) + L"';",
       &result));
   ASSERT_TRUE(result);
 
   if (!contents->controller().GetLastCommittedEntry() ||
       contents->controller().GetLastCommittedEntry()->url() != url)
     ui_test_utils::WaitForNavigation(&contents->controller());
   EXPECT_EQ(url, contents->controller().GetLastCommittedEntry()->url());
 }
 
-#if defined(OS_WIN)
-// AppProcess sometimes hangs on Windows
-// http://crbug.com/58810
-#define MAYBE_AppProcess DISABLED_AppProcess
-#else
-#define MAYBE_AppProcess AppProcess
-#endif
-IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcess) {
+IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisablePopupBlocking);
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process")));
 
   // Open two tabs in the app, one outside it.
   GURL base_url = test_server()->GetURL(
@@ skipping 56 matching lines @@
   NavigateTabHelper(browser()->GetTabContentsAt(6), app_url);
   EXPECT_EQ(host->process(),
             browser()->GetTabContentsAt(6)->render_view_host()->process());
   bool windowOpenerValid = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       browser()->GetTabContentsAt(6)->render_view_host(), L"",
       L"window.domAutomationController.send(window.opener != null)",
       &windowOpenerValid));
   ASSERT_TRUE(windowOpenerValid);
 }
+
+// Tests that app process switching works properly in the following scenario:
+// 1. navigate to a page1 in the app
+// 2. page1 redirects to a page2 outside the app extent

[Charlie Reis, 2011/01/05 00:57:25]

Maybe add "(i.e., /server-redirect)" to make it clear what page2 is.

[Matt Perry, 2011/01/05 01:14:47]

Done.

+// 3. page2 redirects back to a page in the app
+// The final navigation should end up in the app process.
+// See http://crbug.com/61757
+IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kDisablePopupBlocking);
+
+  host_resolver()->AddRule("*", "127.0.0.1");
+  ASSERT_TRUE(test_server()->Start());
+
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process")));
+
+  // Open two tabs in the app, one outside it.

[Charlie Reis, 2011/01/05 00:57:25]

Copy/paste bug.  (There's no third tab outside the app.)

[Matt Perry, 2011/01/05 01:14:47]

Done.

+  GURL base_url = test_server()->GetURL(
+      "files/extensions/api_test/app_process/");
+
+  // The app under test acts on URLs whose host is "localhost",
+  // so the URLs we navigate to must have host "localhost".
+  GURL::Replacements replace_host;
+  std::string host_str("localhost");  // must stay in scope with replace_host
+  replace_host.SetHostStr(host_str);
+  base_url = base_url.ReplaceComponents(replace_host);
+
+  browser()->NewTab();
+  ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html"));
+  browser()->NewTab();
+  ui_test_utils::NavigateToURL(browser(),
+                               base_url.Resolve("path1/redirect.html"));
+
+  NavigationController& controller =
+      browser()->GetSelectedTabContents()->controller();
+  while (controller.GetActiveEntry()->url().path().find("empty.html") ==

[Charlie Reis, 2011/01/05 00:57:25]

"empty.html" is in the redirect URL, too.  Could we end up exiting this loop
before we get to the last page?

[Matt Perry, 2011/01/05 01:14:47]

Good catch! Done.

+         std::string::npos) {
+    ui_test_utils::WaitForNavigation(&controller);
+  }
+
+  // 3 tabs, including the initial about:blank. The last 2 should be the same
+  // process.
+  ASSERT_EQ(3, browser()->tab_count());
+  RenderViewHost* host = browser()->GetTabContentsAt(1)->render_view_host();
+  EXPECT_EQ(host->process(),
+            browser()->GetTabContentsAt(2)->render_view_host()->process());
+}