Rename to ChromiumTestShell package from testshell to shell

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

Index: chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java
diff --git a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java
deleted file mode 100644
index e481db24cde69551770237c9ec6b911fc136608d..0000000000000000000000000000000000000000
--- a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.java
+++ /dev/null
@@ -1,156 +0,0 @@
-// 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.chrome.testshell;
-
-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 static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
-
-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 java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Base test class for all ChromiumTestShell based tests.
- */
-public class ChromiumTestShellTestBase extends
-        ActivityInstrumentationTestCase2<ChromiumTestShellActivity> {
-    /** 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 = "ChromiumTestShellTestBase";
-
-    public ChromiumTestShellTestBase() {
-        super(ChromiumTestShellActivity.class);
-    }
-
-    protected static void startChromeBrowserProcessSync(final Context targetContext) {
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                CommandLine.initFromFile("/data/local/tmp/chromium-testshell-command-line");
-                try {
-                    BrowserStartupController.get(targetContext).startBrowserProcessesSync(
-                            BrowserStartupController.MAX_RENDERERS_LIMIT);
-                } catch (ProcessInitException e) {
-                    Log.e(TAG, "Unable to load native library.", e);
-                    fail("Unable to load native library");
-                }
-            }
-        });
-    }
-
-    /**
-     * Starts the ChromiumTestShell activity and loads the given URL.
-     */
-    protected ChromiumTestShellActivity launchChromiumTestShellWithUrl(String url) {
-        Intent intent = new Intent(Intent.ACTION_MAIN);
-        intent.addCategory(Intent.CATEGORY_LAUNCHER);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (url != null) intent.setData(Uri.parse(url));
-        intent.setComponent(new ComponentName(getInstrumentation().getTargetContext(),
-                ChromiumTestShellActivity.class));
-        setActivityIntent(intent);
-        return getActivity();
-    }
-
-    /**
-     * Starts the ChromiumTestShell activity and loads a blank page.
-     */
-    protected ChromiumTestShellActivity launchChromiumTestShellWithBlankPage() {
-        return launchChromiumTestShellWithUrl("about:blank");
-    }
-
-    /**
-     * Waits for the Active shell to finish loading.  This times out after
-     * WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT milliseconds and it shouldn't be used for long
-     * loading pages. Instead it should be used more for test initialization. The proper way
-     * to wait is to use a TestCallbackHelperContainer after the initial load is completed.
-     * @return Whether or not the Shell was actually finished loading.
-     * @throws InterruptedException
-     */
-    protected boolean waitForActiveShellToBeDoneLoading() throws InterruptedException {
-        final ChromiumTestShellActivity activity = getActivity();
-
-        // Wait for the Content Shell to be initialized.
-        return CriteriaHelper.pollForCriteria(new Criteria() {
-            @Override
-            public boolean isSatisfied() {
-                try {
-                    final AtomicBoolean isLoaded = new AtomicBoolean(false);
-                    runTestOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            TestShellTab tab = activity.getActiveTab();
-                            if (tab != null) {
-                                isLoaded.set(!tab.isLoading()
-                                        && !TextUtils.isEmpty(tab.getContentView().getUrl()));
-                            } else {
-                                isLoaded.set(false);
-                            }
-                        }
-                    });
-
-                    return isLoaded.get();
-                } catch (Throwable e) {
-                    return false;
-                }
-            }
-        }, WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
-    }
-
-    /**
-     * Clear all files and folders in the Chromium testshell's application directory except 'lib'.
-     *
-     * 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 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;
-            }
-        }));
-    }
-}