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

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

Issue 184493006: Rename to ChromiumTestShell package from testshell to shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix py lint Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.prerender; 5 package org.chromium.chrome.browser.prerender;
6 6
7 import android.test.UiThreadTest; 7 import android.test.UiThreadTest;
8 import android.test.suitebuilder.annotation.MediumTest; 8 import android.test.suitebuilder.annotation.MediumTest;
9 import android.test.suitebuilder.annotation.SmallTest; 9 import android.test.suitebuilder.annotation.SmallTest;
10 10
11 import org.chromium.base.ThreadUtils; 11 import org.chromium.base.ThreadUtils;
12 import org.chromium.base.test.util.Feature; 12 import org.chromium.base.test.util.Feature;
13 import org.chromium.chrome.browser.ContentViewUtil; 13 import org.chromium.chrome.browser.ContentViewUtil;
14 import org.chromium.chrome.browser.profiles.Profile; 14 import org.chromium.chrome.browser.profiles.Profile;
15 import org.chromium.chrome.shell.ChromiumTestShellTestBase;
15 import org.chromium.chrome.test.util.TestHttpServerClient; 16 import org.chromium.chrome.test.util.TestHttpServerClient;
16 import org.chromium.chrome.testshell.ChromiumTestShellTestBase;
17 17
18 import java.util.concurrent.Callable; 18 import java.util.concurrent.Callable;
19 19
20 /** 20 /**
21 * Tests for adding and removing prerenders using the {@link ExternalPrerenderHa ndler} 21 * Tests for adding and removing prerenders using the {@link ExternalPrerenderHa ndler}
22 */ 22 */
23 public class ExternalPrerenderRequestTest extends ChromiumTestShellTestBase { 23 public class ExternalPrerenderRequestTest extends ChromiumTestShellTestBase {
24 private static final String GOOGLE_URL = 24 private static final String GOOGLE_URL =
25 TestHttpServerClient.getUrl("chrome/test/data/android/prerender/goog le.html"); 25 TestHttpServerClient.getUrl("chrome/test/data/android/prerender/goog le.html");
26 private static final String YOUTUBE_URL = 26 private static final String YOUTUBE_URL =
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 public void testAddingPrerendersInaRow() throws InterruptedException { 90 public void testAddingPrerendersInaRow() throws InterruptedException {
91 long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0); 91 long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
92 assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( 92 assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
93 mProfile, GOOGLE_URL, webContentsPtr)); 93 mProfile, GOOGLE_URL, webContentsPtr));
94 Thread.sleep(PRERENDER_DELAY_MS); 94 Thread.sleep(PRERENDER_DELAY_MS);
95 long newWebContentsPtr = mHandler.addPrerender(mProfile, YOUTUBE_URL, "" , 0, 0); 95 long newWebContentsPtr = mHandler.addPrerender(mProfile, YOUTUBE_URL, "" , 0, 0);
96 assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( 96 assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
97 mProfile, YOUTUBE_URL, newWebContentsPtr)); 97 mProfile, YOUTUBE_URL, newWebContentsPtr));
98 } 98 }
99 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698