Enable ClickListenerTest.

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 2f8f9c02591c545bcae83f9363436dd93c107402..3ea92755834bb6fff23cbd782aff74015de6002e 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
@@ -4,35 +4,31 @@
 
 package org.chromium.content.browser;
 
-import org.chromium.base.test.util.DisabledTest;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import org.chromium.base.test.util.Feature;
 
 /**
  * Test suite for click listener validation in content detection.
  */
 public class ClickListenerTest extends ContentDetectionTestBase {
 
-    /*
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
-    http://crbug.com/172786
-    */
-    @DisabledTest
     public void testClickContentOnLink() throws Throwable {
         startActivityWithTestUrl("content/content_detection/click_listeners.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // Clicks on addresses in links should change the url.
         scrollAndTapNavigatingOut("linktest");
         assertTrue(isCurrentTestUrl("content/content_detection/empty.html"));
     }
 
-    /*
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
-    http://crbug.com/172786
-    */
-    @DisabledTest
     public void testClickContentOnJSListener1() throws Throwable {
         startActivityWithTestUrl("content/content_detection/click_listeners.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // Clicks on addresses in elements listening to click events should be
         // processed normally without address detection.
@@ -40,14 +36,11 @@ public class ClickListenerTest extends ContentDetectionTestBase {
         assertTrue(isCurrentTestUrl("content/content_detection/empty.html"));
     }
 
-    /*
     @MediumTest
     @Feature({"ContentDetection", "TabContents"})
-    http://crbug.com/172786
-    */
-    @DisabledTest
     public void testClickContentOnJSListener2() throws Throwable {
         startActivityWithTestUrl("content/content_detection/click_listeners.html");
+        assertWaitForPageScaleFactorMatch(1.0f);
 
         // Same as previous test, but using addEventListener instead of onclick.
         scrollAndTapNavigatingOut("clicktest2");