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

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java

Issue 406023002: Restructuring NavigationController functionalities from ContentViewCore to NavigationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch with findbugs_known_bugs.txt changes. Created 6 years, 3 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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.android_webview.test; 5 package org.chromium.android_webview.test;
6 6
7 import android.test.suitebuilder.annotation.SmallTest; 7 import android.test.suitebuilder.annotation.SmallTest;
8 import android.util.Pair; 8 import android.util.Pair;
9 9
10 import org.apache.http.Header; 10 import org.apache.http.Header;
11 import org.apache.http.HttpRequest; 11 import org.apache.http.HttpRequest;
12 import org.chromium.android_webview.AwContents; 12 import org.chromium.android_webview.AwContents;
13 import org.chromium.android_webview.AwSettings; 13 import org.chromium.android_webview.AwSettings;
14 import org.chromium.android_webview.test.util.CommonResources; 14 import org.chromium.android_webview.test.util.CommonResources;
15 import org.chromium.android_webview.test.util.JSUtils; 15 import org.chromium.android_webview.test.util.JSUtils;
16 import org.chromium.base.test.util.Feature; 16 import org.chromium.base.test.util.Feature;
17 import org.chromium.content.browser.LoadUrlParams;
18 import org.chromium.content.browser.test.util.CallbackHelper; 17 import org.chromium.content.browser.test.util.CallbackHelper;
19 import org.chromium.content.browser.test.util.HistoryUtils; 18 import org.chromium.content.browser.test.util.HistoryUtils;
19 import org.chromium.content_public.browser.LoadUrlParams;
20 import org.chromium.net.test.util.TestWebServer; 20 import org.chromium.net.test.util.TestWebServer;
21 21
22 import java.util.ArrayList; 22 import java.util.ArrayList;
23 import java.util.HashMap; 23 import java.util.HashMap;
24 import java.util.List; 24 import java.util.List;
25 import java.util.Locale; 25 import java.util.Locale;
26 import java.util.Map; 26 import java.util.Map;
27 import java.util.concurrent.TimeUnit; 27 import java.util.concurrent.TimeUnit;
28 28
29 /** 29 /**
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 HistoryUtils.goBackSync(getInstrumentation(), 325 HistoryUtils.goBackSync(getInstrumentation(),
326 awContents.getContentViewCore(), 326 awContents.getContentViewCore(),
327 contentsClient.getOnPageFinishedHelper()); 327 contentsClient.getOnPageFinishedHelper());
328 assertEquals(2, webServer.getRequestCount(path)); 328 assertEquals(2, webServer.getRequestCount(path));
329 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path)) ; 329 validateRequestHeaders(extraHeaders, webServer.getLastRequest(path)) ;
330 } finally { 330 } finally {
331 if (webServer != null) webServer.shutdown(); 331 if (webServer != null) webServer.shutdown();
332 } 332 }
333 } 333 }
334 } 334 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698