Revert of Remove unnecessary page loading in ContentShellActivity

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

Index: content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
index 6d9e807901fba011bc56f0fc9ecdc2a6317db424..2c57e8143aa8a361c1c0a68db5477d0a00628c27 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
@@ -18,6 +18,7 @@
     public void testClickContentOnLink() throws Throwable {
         startActivityWithTestUrl(
                 "content/test/data/android/content_detection/click_listeners.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // Clicks on addresses in links should change the url.
         scrollAndTapNavigatingOut("linktest");
@@ -29,6 +30,7 @@
     public void testClickContentOnJSListener1() throws Throwable {
         startActivityWithTestUrl(
                 "content/test/data/android/content_detection/click_listeners.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // Clicks on addresses in elements listening to click events should be
         // processed normally without address detection.
@@ -41,6 +43,7 @@
     public void testClickContentOnJSListener2() throws Throwable {
         startActivityWithTestUrl(
                 "content/test/data/android/content_detection/click_listeners.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // Same as previous test, but using addEventListener instead of onclick.
         scrollAndTapNavigatingOut("clicktest2");