Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3675)

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

Issue 2086483004: Remove ChromePrerenderService, keeping only its skeleton behind. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Explain why the service is staying. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1c3da1501ddfe314db3ab5d501d5d0a11b922c07..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
+++ /dev/null
@@ -1,126 +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 static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
-
-import android.os.Environment;
-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.base.test.util.Restriction;
-import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
-import org.chromium.content_public.browser.WebContents;
-import org.chromium.net.test.EmbeddedTestServer;
-
-import java.util.concurrent.Callable;
-
-/**
- * Tests for adding and removing prerenders using the {@link ExternalPrerenderHandler}
- */
-public class ExternalPrerenderRequestTest extends ChromeActivityTestCaseBase<ChromeActivity> {
- private static final String GOOGLE_PATH =
- "/chrome/test/data/android/prerender/google.html";
- private static final String YOUTUBE_PATH =
- "/chrome/test/data/android/prerender/youtube.html";
- private static final int PRERENDER_DELAY_MS = 500;
-
- private String mGoogleUrl;
- private ExternalPrerenderHandler mHandler;
- private Profile mProfile;
- private EmbeddedTestServer mTestServer;
- private String mYoutubeUrl;
-
- public ExternalPrerenderRequestTest() {
- super(ChromeActivity.class);
- }
-
- @Override
- public void startMainActivity() throws InterruptedException {
- startMainActivityOnBlankPage();
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- mHandler = new ExternalPrerenderHandler();
- final Callable<Profile> profileCallable = new Callable<Profile>() {
- @Override
- public Profile call() throws Exception {
- return Profile.getLastUsedProfile();
- }
- };
- mProfile = ThreadUtils.runOnUiThreadBlocking(profileCallable);
-
- mTestServer = EmbeddedTestServer.createAndStartFileServer(
- getInstrumentation().getContext(), Environment.getExternalStorageDirectory());
- mGoogleUrl = mTestServer.getURL(GOOGLE_PATH);
- mYoutubeUrl = mTestServer.getURL(YOUTUBE_PATH);
- }
-
- @Override
- protected void tearDown() throws Exception {
- mTestServer.stopAndDestroyServer();
- super.tearDown();
- }
-
- @MediumTest
- @UiThreadTest
- @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
- @Feature({"Prerender"})
- /**
- * Test adding a prerender and canceling that to add a new one.
- */
- public void testAddPrerenderAndCancel() throws InterruptedException {
- WebContents webContents = mHandler.addPrerender(mProfile, mGoogleUrl, "", 0, 0, false);
- assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
- mProfile, mGoogleUrl, webContents));
-
- mHandler.cancelCurrentPrerender();
- assertFalse(ExternalPrerenderHandler.hasPrerenderedUrl(
- mProfile, mGoogleUrl, webContents));
- webContents.destroy();
- Thread.sleep(PRERENDER_DELAY_MS);
- webContents = mHandler.addPrerender(mProfile, mYoutubeUrl, "", 0, 0, false);
- assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
- mProfile, mYoutubeUrl, webContents));
- }
-
- @SmallTest
- @UiThreadTest
- @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
- @Feature({"Prerender"})
- /**
- * Test calling cancel without any added prerenders.
- */
- public void testCancelPrerender() {
- mHandler.cancelCurrentPrerender();
- WebContents webContents = mHandler.addPrerender(mProfile, mGoogleUrl, "", 0, 0, false);
- assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
- mProfile, mGoogleUrl, webContents));
- }
-
- @MediumTest
- @UiThreadTest
- @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
- @Feature({"Prerender"})
- /**
- * Test adding two prerenders without canceling the first one.
- */
- public void testAddingPrerendersInaRow() throws InterruptedException {
- WebContents webContents = mHandler.addPrerender(mProfile, mGoogleUrl, "", 0, 0, false);
- assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
- mProfile, mGoogleUrl, webContents));
- Thread.sleep(PRERENDER_DELAY_MS);
- WebContents newWebContents = mHandler.addPrerender(mProfile, mYoutubeUrl, "", 0, 0, false);
- assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
- mProfile, mYoutubeUrl, newWebContents));
- }
-}

Powered by Google App Engine
This is Rietveld 408576698