Fix flaky AppApiTest.AppProcess.

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 "chrome/browser/browser.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/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 39 matching lines @@
       &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());
 }
 
 // This test is flaky, see bug 42497.
-IN_PROC_BROWSER_TEST_F(AppApiTest, FLAKY_AppProcess) {
+IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
   host_resolver()->AddRule("*", "127.0.0.1");
   StartHTTPServer();
 
   ASSERT_TRUE(RunExtensionTest("app_process")) << message_;
 
   Extension* extension = GetSingleLoadedExtension();
   ExtensionHost* host = browser()->profile()->GetExtensionProcessManager()->
       GetBackgroundHostForExtension(extension);
   ASSERT_TRUE(host);
 
   // The extension should have opened 3 new tabs. Including the original blank
   // tab, we now have 4 tabs. Two should be part of the extension app, and
   // grouped in the extension process.
   ASSERT_EQ(4, browser()->tab_count());
   EXPECT_EQ(host->render_process_host(),
             browser()->GetTabContentsAt(1)->render_view_host()->process());
   EXPECT_EQ(host->render_process_host(),
             browser()->GetTabContentsAt(2)->render_view_host()->process());
   EXPECT_NE(host->render_process_host(),
             browser()->GetTabContentsAt(3)->render_view_host()->process());
 
   // Now let's do the same using window.open. The same should happen.
+  GURL base_url("http://localhost:1337/files/extensions/api_test/app_process/");
   WindowOpenHelper(browser(), host->render_view_host(),
-                   browser()->GetTabContentsAt(1)->GetURL());
+                   base_url.Resolve("path1/empty.html"));
   WindowOpenHelper(browser(), host->render_view_host(),
-                   browser()->GetTabContentsAt(2)->GetURL());
+                   base_url.Resolve("path2/empty.html"));
   WindowOpenHelper(browser(), host->render_view_host(),
-                   browser()->GetTabContentsAt(3)->GetURL());
+                   base_url.Resolve("path3/empty.html"));
 
   ASSERT_EQ(7, browser()->tab_count());
   EXPECT_EQ(host->render_process_host(),
             browser()->GetTabContentsAt(4)->render_view_host()->process());
   EXPECT_EQ(host->render_process_host(),
             browser()->GetTabContentsAt(5)->render_view_host()->process());
   EXPECT_NE(host->render_process_host(),
             browser()->GetTabContentsAt(6)->render_view_host()->process());
 
   // Now let's have these pages navigate, into or out of the extension web
   // extent. They should switch processes.
-  const GURL& app_url(browser()->GetTabContentsAt(1)->GetURL());
-  const GURL& non_app_url(browser()->GetTabContentsAt(3)->GetURL());
+  const GURL& app_url(base_url.Resolve("path1/empty.html"));
+  const GURL& non_app_url(base_url.Resolve("path3/empty.html"));
   NavigateTabHelper(browser()->GetTabContentsAt(1), non_app_url);
   NavigateTabHelper(browser()->GetTabContentsAt(3), app_url);
   EXPECT_NE(host->render_process_host(),
             browser()->GetTabContentsAt(1)->render_view_host()->process());
   EXPECT_EQ(host->render_process_host(),
             browser()->GetTabContentsAt(3)->render_view_host()->process());
 }