Revert of Remove unnecessary page loading in ContentShellActivity

content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java

 // Copyright 2012 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.content.browser;
 
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.CommandLineFlags;
@@ skipping 12 matching lines @@
         final String expectedUrl = TELEPHONE_INTENT_PREFIX + urlForContent(expectedContent);
         return intentUrl.equals(expectedUrl);
     }
 
     @LargeTest
     @Feature({"ContentDetection", "TabContents"})
     @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=US")
     public void testInternationalNumberIntents() throws Throwable {
         startActivityWithTestUrl(
                 "content/test/data/android/content_detection/phone_international.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // US: +1 650-253-0000.
         String intentUrl = scrollAndTapExpectingIntent("US");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+16502530000"));
 
         // Australia: +61 2 9374 4000.
         intentUrl = scrollAndTapExpectingIntent("Australia");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+61293744000"));
 
         // China: +86-10-62503000.
@@ skipping 96 matching lines @@
         intentUrl = scrollAndTapExpectingIntent("UAE");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+97144509500"));
     }
 
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
     @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=US")
     public void testLocalUSNumbers() throws Throwable {
         startActivityWithTestUrl(
                 "content/test/data/android/content_detection/phone_local.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // US_1: 1-888-433-5788.
         String intentUrl = scrollAndTapExpectingIntent("US_1");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+18884335788"));
 
         // US_2: 703-293-6299.
         intentUrl = scrollAndTapExpectingIntent("US_2");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+17032936299"));
 
         // US_3: (202) 456-2121.
         intentUrl = scrollAndTapExpectingIntent("US_3");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+12024562121"));
 
         // International numbers should still work.
         intentUrl = scrollAndTapExpectingIntent("International");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
     }
 
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
     @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=GB")
     public void testLocalUKNumbers() throws Throwable {
         startActivityWithTestUrl(
                 "content/test/data/android/content_detection/phone_local.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // GB_1: (0) 20 7323 8299.
         String intentUrl = scrollAndTapExpectingIntent("GB_1");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "02073238299"));
 
         // GB_2: 01227865330.
         intentUrl = scrollAndTapExpectingIntent("GB_2");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "01227865330"));
 
         // GB_3: 01963 824686.
         intentUrl = scrollAndTapExpectingIntent("GB_3");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "01963824686"));
 
         // International numbers should still work.
         intentUrl = scrollAndTapExpectingIntent("International");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
     }
 
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
     @CommandLineFlags.Add(ContentSwitches.NETWORK_COUNTRY_ISO + "=FR")
     public void testLocalFRNumbers() throws Throwable {
         startActivityWithTestUrl(
                 "content/test/data/android/content_detection/phone_local.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // FR_1: 01 40 20 50 50.
         String intentUrl = scrollAndTapExpectingIntent("FR_1");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "0140205050"));
 
         // FR_2: 0326475534.
         intentUrl = scrollAndTapExpectingIntent("FR_2");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "0326475534"));
 
         // FR_3: (0) 237 211 992.
         intentUrl = scrollAndTapExpectingIntent("FR_3");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "0237211992"));
 
         // International numbers should still work.
         intentUrl = scrollAndTapExpectingIntent("International");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
     }
 }