Rename chrome/android/javatests to javatests_shell.

chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
deleted file mode 100644
index 4419c25aa854a42b1cad2d084ff514a4ee0659b2..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 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.browser.prerender;
-
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.shell.ChromeShellTestBase;
-import org.chromium.chrome.test.util.TestHttpServerClient;
-import org.chromium.content_public.browser.WebContents;
-
-import java.util.concurrent.Callable;
-
-/**
- * Tests for adding and removing prerenders using the {@link ExternalPrerenderHandler}
- */
-public class ExternalPrerenderRequestTest extends ChromeShellTestBase {
-    private static final String GOOGLE_URL =
-            TestHttpServerClient.getUrl("chrome/test/data/android/prerender/google.html");
-    private static final String YOUTUBE_URL =
-            TestHttpServerClient.getUrl("chrome/test/data/android/prerender/youtube.html");
-    private static final int PRERENDER_DELAY_MS = 500;
-
-    private ExternalPrerenderHandler mHandler;
-    private Profile mProfile;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        clearAppData();
-        launchChromeShellWithBlankPage();
-        assertTrue(waitForActiveShellToBeDoneLoading());
-        mHandler = new ExternalPrerenderHandler();
-        final Callable<Profile> profileCallable = new Callable<Profile>() {
-            @Override
-            public Profile call() throws Exception {
-                return Profile.getLastUsedProfile();
-            }
-        };
-        mProfile = ThreadUtils.runOnUiThreadBlocking(profileCallable);
-    }
-
-    @MediumTest
-    @UiThreadTest
-    @Feature({"Prerender"})
-    /**
-     * Test adding a prerender and canceling that to add a new one.
-     */
-    public void testAddPrerenderAndCancel() throws InterruptedException {
-        WebContents webContents = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
-        assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContents));
-
-        mHandler.cancelCurrentPrerender();
-        assertFalse(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContents));
-        webContents.destroy();
-        Thread.sleep(PRERENDER_DELAY_MS);
-        webContents = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0);
-        assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, YOUTUBE_URL, webContents));
-
-    }
-
-    @SmallTest
-    @UiThreadTest
-    @Feature({"Prerender"})
-    /**
-     * Test calling cancel without any added prerenders.
-     */
-    public void testCancelPrerender() {
-        mHandler.cancelCurrentPrerender();
-        WebContents webContents = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
-        assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContents));
-    }
-
-    @MediumTest
-    @UiThreadTest
-    @Feature({"Prerender"})
-    /**
-     * Test adding two prerenders without canceling the first one.
-     */
-    public void testAddingPrerendersInaRow() throws InterruptedException {
-        WebContents webContents = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
-        assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, GOOGLE_URL, webContents));
-        Thread.sleep(PRERENDER_DELAY_MS);
-        WebContents newWebContents = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0);
-        assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
-                mProfile, YOUTUBE_URL, newWebContents));
-    }
-}