android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java - Issue 2254693002: Delay generation of User-Agent header to URLRequestHttpJob and accept custom User-Agent from XHR/Fe…

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

Issue 2254693002: Delay generation of User-Agent header to URLRequestHttpJob and accept custom User-Agent from XHR/Fe… Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed Android test Created 4 years, 4 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

« no previous file with comments | « no previous file | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | third_party/WebKit/LayoutTests/http/tests/fetch/resources/useragent-header-iframe.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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;

(...skipping 165 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
176 final AwContents awContents = testContainerView.getAwContents();	176 final AwContents awContents = testContainerView.getAwContents();

177	177

178 TestWebServer webServer = TestWebServer.start();	178 TestWebServer webServer = TestWebServer.start();

179 try {	179 try {

180 final String path = "/no_overriding_of_existing_headers_test.html";	180 final String path = "/no_overriding_of_existing_headers_test.html";

181 final String url = webServer.setResponse(	181 final String url = webServer.setResponse(

182 path,	182 path,

183 "<html><body>foo</body></html>",	183 "<html><body>foo</body></html>",

184 null);	184 null);

185 String[] extraHeaders = {	185 String[] extraHeaders = {

186 "user-agent", "007"	186 "connection", "007"

187 };	187 };

188	188

189 loadUrlWithExtraHeadersSync(awContents,	189 loadUrlWithExtraHeadersSync(awContents,

190 contentsClient.getOnPageFinishedHelper() ,	190 contentsClient.getOnPageFinishedHelper() ,

191 url,	191 url,

192 createHeadersMap(extraHeaders));	192 createHeadersMap(extraHeaders));

193 Header[] matchingHeaders = webServer.getLastRequest(path).getHeaders (extraHeaders[0]);	193 Header[] matchingHeaders = webServer.getLastRequest(path).getHeaders (extraHeaders[0]);

194 assertEquals(1, matchingHeaders.length);	194 assertEquals(1, matchingHeaders.length);

195 Header header = matchingHeaders[0];	195 Header header = matchingHeaders[0];

196 assertEquals(extraHeaders[0].toLowerCase(Locale.ENGLISH),	196 assertEquals(extraHeaders[0].toLowerCase(Locale.ENGLISH),

(...skipping 205 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
402 // onReceivedTitle is still being called.	402 // onReceivedTitle is still being called.

403 onReceivedTitleCallCount = onReceivedTitleHelper.getCallCount();	403 onReceivedTitleCallCount = onReceivedTitleHelper.getCallCount();

404 loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), ur l2);	404 loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), ur l2);

405 onReceivedTitleHelper.waitForCallback(onReceivedTitleCallCount);	405 onReceivedTitleHelper.waitForCallback(onReceivedTitleCallCount);

406 assertEquals(title, onReceivedTitleHelper.getTitle());	406 assertEquals(title, onReceivedTitleHelper.getTitle());

407 } finally {	407 } finally {

408 webServer.shutdown();	408 webServer.shutdown();

409 }	409 }

410 }	410 }

411 }	411 }

OLD	NEW