Fixed process binding tests

chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser;
 
 import android.content.Context;
 import android.support.test.filters.LargeTest;
 import android.test.MoreAsserts;
 import android.util.SparseArray;
@@ skipping 140 matching lines @@
 
     private MockBindingManager mBindingManager;
     private EmbeddedTestServer mTestServer;
 
     private static final String FILE_PATH = "/chrome/test/data/android/test.html";
     private static final String FILE_PATH2 = "/chrome/test/data/android/simple.html";
     // about:version will always be handled by a different renderer than a local file.
     private static final String ABOUT_VERSION_PATH = "chrome://version/";
     private static final String SHARED_RENDERER_PAGE_PATH =
             "/chrome/test/data/android/bindingmanager/shared_renderer1.html";
+    private static final String SHARED_RENDERER_PAGE2_PATH =
+            "/chrome/test/data/android/bindingmanager/shared_renderer2.html";
 
     public BindingManagerIntegrationTest() {
         super(ChromeActivity.class);
     }
 
     /**
      * Verifies that the .setProcessInForeground() signal is called correctly as the tabs are
      * created and switched.
      */
     @LargeTest
@@ skipping 170 matching lines @@
     }
 
     /**
      * Verifies that a renderer that crashes in foreground has the correct visibility when
      * recreated.
      */
     @LargeTest
     @Feature({"ProcessManagement"})
     public void testCrashInForeground() throws InterruptedException {
         // Create a tab in foreground and wait until it is loaded.
+        final String testUrl = mTestServer.getURL(FILE_PATH);
         final Tab tab = ThreadUtils.runOnUiThreadBlockingNoException(
                 new Callable<Tab>() {
                     @Override
                     public Tab call() throws Exception {
                         TabCreator tabCreator = getActivity().getCurrentTabCreator();
                         return tabCreator.createNewTab(
-                                new LoadUrlParams(mTestServer.getURL(FILE_PATH)),
-                                        TabLaunchType.FROM_CHROME_UI, null);
+                                new LoadUrlParams(testUrl), TabLaunchType.FROM_CHROME_UI, null);
                     }
                 });
-        ChromeTabUtils.waitForTabPageLoaded(tab, mTestServer.getURL(FILE_PATH));
+        ChromeTabUtils.waitForTabPageLoaded(tab, testUrl);
         getInstrumentation().waitForIdleSync();
 
         // Kill the renderer and wait for the crash to be noted by the browser process.
         assertTrue(ChildProcessLauncher.crashProcessForTesting(
                 tab.getContentViewCore().getCurrentRenderProcessId()));
 
         CriteriaHelper.pollInstrumentationThread(
                 new Criteria("Renderer crash wasn't noticed by the browser.") {
                     @Override
                     public boolean isSatisfied() {
                         return tab.getContentViewCore().getCurrentRenderProcessId() == 0;
                     }
                 });
 
         // Reload the tab, respawning the renderer.
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 tab.reload();
             }
         });
 
+        ChromeTabUtils.waitForTabPageLoaded(tab, testUrl);
+
         // Wait until the process is spawned and its visibility is determined.
         CriteriaHelper.pollInstrumentationThread(
                 new Criteria("Process for the crashed tab was not respawned.") {
                     @Override
                     public boolean isSatisfied() {
                         return tab.getContentViewCore().getCurrentRenderProcessId() != 0;
                     }
                 });
 
         mBindingManager.assertSetInForegroundWasCalled(
@@ skipping 192 matching lines @@
                     }
                 });
         // Reload the tab, respawning the renderer.
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 tabs[1].reload();
             }
         });
 
+        ChromeTabUtils.waitForTabPageLoaded(
+                tabs[1], mTestServer.getURL(SHARED_RENDERER_PAGE2_PATH));
+
         // Wait until the process is spawned and its visibility is determined.
         CriteriaHelper.pollInstrumentationThread(
                 new Criteria("Process for the crashed tab was not respawned.") {
                     @Override
                     public boolean isSatisfied() {
                         return tabs[1].getContentViewCore().getCurrentRenderProcessId() != 0;
                     }
                 });
 
         mBindingManager.assertSetInForegroundWasCalled(
@@ skipping 35 matching lines @@
         super.tearDown();
     }
 
     /**
      * @return the index of the given tab in the current tab model
      */
     private int indexOf(Tab tab) {
         return getActivity().getCurrentTabModel().indexOf(tab);
     }
 }