Better distinguish didFinishLoad and didStopLoading

chrome/android/javatests/src/org/chromium/chrome/browser/GeolocationTest.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.location.Location;
 import android.test.FlakyTest;
 
 import org.chromium.base.ThreadUtils;
@@ skipping 74 matching lines @@
      */
     @FlakyTest
     public void testGeolocationPlumbing() throws Exception {
         final String url = TestHttpServerClient.getUrl(
                 "chrome/test/data/geolocation/geolocation_on_load.html");
 
         Tab tab = getActivity().getActivityTab();
         final CallbackHelper loadCallback = new CallbackHelper();
         TabObserver observer = new EmptyTabObserver() {
             @Override
-            public void onLoadStopped(Tab tab) {
+            public void onLoadStopped(Tab tab, boolean toDifferentDocument) {
                 // If the device has a cached non-mock location, we won't get back our
                 // lat/long, so checking that it has "#pass" is sufficient.
                 if (tab.getUrl().startsWith(url + "#pass|")) {
                     loadCallback.notifyCalled();
                 }
             }
         };
         tab.addObserver(observer);
         loadUrl(url);
         assertTrue("InfoBar not added.", mListener.addInfoBarAnimationFinished());
@@ skipping 16 matching lines @@
      */
     @FlakyTest
     public void testGeolocationWatch() throws Exception {
         final String url = TestHttpServerClient.getUrl(
                 "chrome/test/data/geolocation/geolocation_on_load.html");
 
         Tab tab = getActivity().getActivityTab();
         final CallbackHelper loadCallback0 = new CallbackHelper();
         TabObserver observer = new EmptyTabObserver() {
             @Override
-            public void onLoadStopped(Tab tab) {
+            public void onLoadStopped(Tab tab, boolean toDifferentDocument) {
                 // If the device has a cached non-mock location, we won't get back our
                 // lat/long, so checking that it has "#pass" is sufficient.
                 if (tab.getUrl().startsWith(url + "#pass|0|")) {
                     loadCallback0.notifyCalled();
                 }
             }
         };
         tab.addObserver(observer);
         loadUrl(url);
         assertTrue("InfoBar not added.", mListener.addInfoBarAnimationFinished());
 
         List<InfoBar> infoBars = getActivity().getActivityTab().getInfoBarContainer().getInfoBars();
         assertTrue("OK button wasn't found", InfoBarUtil.clickPrimaryButton(infoBars.get(0)));
 
         sendLocation(createMockLocation(LATITUDE, LONGITUDE, ACCURACY));
 
         loadCallback0.waitForCallback(0);
         tab.removeObserver(observer);
 
         // Send another location: it'll update the URL again, so increase the count.
         final CallbackHelper loadCallback1 = new CallbackHelper();
         observer = new EmptyTabObserver() {
             @Override
-            public void onLoadStopped(Tab tab) {
+            public void onLoadStopped(Tab tab, boolean toDifferentDocument) {
                 // If the device has a cached non-mock location, we won't get back our
                 // lat/long, so checking that it has "#pass" is sufficient.
                 if (tab.getUrl().startsWith(url + "#pass|1|")) {
                     loadCallback1.notifyCalled();
                 }
             }
         };
         tab.addObserver(observer);
         sendLocation(createMockLocation(LATITUDE + 1, LONGITUDE - 1, ACCURACY - 1));
         loadCallback1.waitForCallback(0);
@@ skipping 22 matching lines @@
                         location.getLatitude(), location.getLongitude(),
                         location.getTime() / 1000.0,
                         location.hasAltitude(), location.getAltitude(),
                         location.hasAccuracy(), location.getAccuracy(),
                         location.hasBearing(), location.getBearing(),
                         location.hasSpeed(), location.getSpeed());
             }
         });
     }
 }