Add ContextMenu support upstream for Android

chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java

 // Copyright (c) 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.chrome.testshell;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ skipping 108 matching lines @@
      */
     public void loadUrlWithSanitization(final String url) throws InterruptedException {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 getActivity().getActiveTab().loadUrlWithSanitization(url);
             }
         });
         waitForActiveShellToBeDoneLoading();
     }
+
+    // TODO(aelias): This method needs to be removed once http://crbug.com/179511 is fixed.
+    // Meanwhile, we have to wait if the page has the <meta viewport> tag.
+    /**
+     * Waits till the ContentViewCore receives the expected page scale factor
+     * from the compositor and asserts that this happens.
+     */
+    protected void assertWaitForPageScaleFactorMatch(final float expectedScale)
+            throws InterruptedException {
+        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return getActivity().getActiveTab().getContentViewCore().getScale() ==
+                        expectedScale;
+            }
+        }));
+    }
 }