Upstream Site Settings.

chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java

 // Copyright 2014 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.shell;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 import android.text.TextUtils;
 import android.util.Log;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.test.util.ApplicationData;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
+import org.chromium.content_public.browser.LoadUrlParams;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Base test class for all ChromeShell based tests.
  */
 public class ChromeShellTestBase extends ActivityInstrumentationTestCase2<ChromeShellActivity> {
     /** The maximum time the waitForActiveShellToBeDoneLoading method will wait. */
     private static final long WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT = scaleTimeout(10000);
     private static final String TAG = "ChromeShellTestBase";
@@ skipping 82 matching lines @@
      *
      * The 'cache' directory is recreated as an empty directory.
      *
      * @return Whether clearing the application data was successful.
      */
     protected boolean clearAppData() throws InterruptedException {
         return ApplicationData.clearAppData(getInstrumentation().getTargetContext());
     }
 
     /**
+     * Navigates the currently active tab to {@code url} and waits for the page to finish loading.
+     */
+    public void loadUrl(final String url) throws InterruptedException {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                getActivity().getActiveTab().loadUrl(new LoadUrlParams(url));
+            }
+        });
+        waitForActiveShellToBeDoneLoading();
+    }
+
+    /**
      * Navigates the currently active tab to a sanitized version of {@code url}.
      * @param url The potentially unsanitized URL to navigate to.
      */
     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;
+                return getActivity().getActiveTab().getContentViewCore().getScale()
+                        == expectedScale;
             }
         }));
     }
 }