| Index: chrome/browser/extensions/app_process_apitest.cc
|
| diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
|
| index fa4251ac7a0a60cae888390a6a456e9f83326786..9cfc1f09d5d539526556c47fd7a11ec57466a309 100644
|
| --- a/chrome/browser/extensions/app_process_apitest.cc
|
| +++ b/chrome/browser/extensions/app_process_apitest.cc
|
| @@ -152,12 +152,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
|
| WindowOpenHelper(browser(), host,
|
| base_url.Resolve("path2/empty.html"), true);
|
| LOG(INFO) << "WindowOpenHelper 2.";
|
| - // TODO(creis): This should open in a new process (i.e., false for the last
|
| - // argument), but we temporarily avoid swapping processes away from an app
|
| - // until we're able to support cross-process postMessage calls.
|
| - // See crbug.com/59285.
|
| + // This should open in a new process (i.e., false for the last argument).
|
| WindowOpenHelper(browser(), host,
|
| - base_url.Resolve("path3/empty.html"), true);
|
| + base_url.Resolve("path3/empty.html"), false);
|
| LOG(INFO) << "WindowOpenHelper 3.";
|
|
|
| // Now let's have these pages navigate, into or out of the extension web
|
| @@ -168,10 +165,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
|
| LOG(INFO) << "NavigateTabHelper 1.";
|
| NavigateTabHelper(browser()->GetTabContentsAt(3), app_url);
|
| LOG(INFO) << "NavigateTabHelper 2.";
|
| - // TODO(creis): This should swap out of the app's process (i.e., EXPECT_NE),
|
| - // but we temporarily avoid swapping away from an app in case the window
|
| - // tries to send a postMessage to the app. See crbug.com/59285.
|
| - EXPECT_EQ(host->process(),
|
| + EXPECT_NE(host->process(),
|
| browser()->GetTabContentsAt(2)->render_view_host()->process());
|
| EXPECT_EQ(host->process(),
|
| browser()->GetTabContentsAt(3)->render_view_host()->process());
|
| @@ -354,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) {
|
| browser()->NewTab();
|
| ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html"));
|
| browser()->NewTab();
|
| - // Wait until the second tab finishes its redirect train (3 hops).
|
| + // Wait until the second tab finishes its redirect train (2 hops).
|
| // 1. We navigate to redirect.html
|
| // 2. Renderer navigates and finishes, counting as a load stop.
|
| // 3. Renderer issues the meta refresh to navigate to server-redirect.
|
| @@ -362,13 +356,10 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) {
|
| // complete.
|
| // 5. Browser sees a redirect response from server-redirect to empty.html, and
|
| // transfers that to a new navigation, using RequestTransferURL.
|
| - // 6. We navigate to empty.html.
|
| - // 7. Renderer is still in a provisional load to server-redirect, so that is
|
| - // cancelled, and counts as a load stop
|
| // 8. Renderer navigates to empty.html, and finishes loading, counting as the
|
| - // third load stop
|
| + // second load stop
|
| ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
|
| - browser(), base_url.Resolve("path1/redirect.html"), 3);
|
| + browser(), base_url.Resolve("path1/redirect.html"), 2);
|
|
|
| // 3 tabs, including the initial about:blank. The last 2 should be the same
|
| // process.
|
|
|