chrome/browser/captive_portal/captive_portal_browsertest.cc - Issue 10534100: Decouple URLRequestJob from URLRequestContext; access NetworkDelegate as a contructor parameter.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 10534100: Decouple URLRequestJob from URLRequestContext; access NetworkDelegate as a contructor parameter. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed more files Created 8 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

« no previous file with comments | « chrome/browser/automation/url_request_automation_job.cc ('k') | chrome/browser/chromeos/gdata/gdata_protocol_handler.cc » ('j') | net/url_request/url_request_job.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/captive_portal/captive_portal_browsertest.cc

diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc

index 2dd1e1a9df98270962a57243bfe58be5ed7b040e..142ed68b2057578d0e3c1352271c004bacd4e646 100644

--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc

+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc

@@ -43,6 +43,7 @@

#include "content/test/net/url_request_failed_job.h"

#include "content/test/net/url_request_mock_http_job.h"

#include "net/base/net_errors.h"

+#include "net/url_request/url_request_context.h"

mmenke 2012/06/22 20:23:43 Let's include url_request as well, since we're now

shalev 2012/06/22 20:53:55 Done.

#include "net/url_request/url_request_filter.h"

#include "net/url_request/url_request_job.h"

#include "net/url_request/url_request_status.h"

@@ -160,7 +161,7 @@ void URLRequestTimeoutOnDemandJob::AbandonRequests() {

URLRequestTimeoutOnDemandJob::URLRequestTimeoutOnDemandJob(

net::URLRequest* request)

- : net::URLRequestJob(request),

+ : net::URLRequestJob(request, request->context()->network_delegate()),

next_job_(NULL) {

}