From 180aad7c121d6ad743e639769fc1b6c39b5ad5b5 Mon Sep 17 00:00:00 2001 From: "shalev@chromium.org" Date: Fri, 29 Jun 2012 19:07:33 +0000 Subject: Decouple URLRequestJob from URLRequestContext; access NetworkDelegate as a contructor parameter. Note: this depends on http://codereview.chromium.org/10559036/ BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/10534100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144948 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/net/view_http_cache_job_factory.cc | 4 ++-- content/test/net/url_request_abort_on_end_job.cc | 7 +++++-- content/test/net/url_request_failed_job.cc | 3 ++- content/test/net/url_request_slow_download_job.cc | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'content') diff --git a/content/browser/net/view_http_cache_job_factory.cc b/content/browser/net/view_http_cache_job_factory.cc index 738524f..dddb9ba 100644 --- a/content/browser/net/view_http_cache_job_factory.cc +++ b/content/browser/net/view_http_cache_job_factory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -25,7 +25,7 @@ namespace { class ViewHttpCacheJob : public net::URLRequestJob { public: explicit ViewHttpCacheJob(net::URLRequest* request) - : net::URLRequestJob(request), + : net::URLRequestJob(request, request->context()->network_delegate()), core_(new Core), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), ALLOW_THIS_IN_INITIALIZER_LIST( diff --git a/content/test/net/url_request_abort_on_end_job.cc b/content/test/net/url_request_abort_on_end_job.cc index 4cb729f..8216220 100644 --- a/content/test/net/url_request_abort_on_end_job.cc +++ b/content/test/net/url_request_abort_on_end_job.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // This class simulates what wininet does when a dns lookup fails. @@ -13,6 +13,8 @@ #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" +#include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_status.h" @@ -57,7 +59,8 @@ void URLRequestAbortOnEndJob::GetResponseInfoConst( } URLRequestAbortOnEndJob::URLRequestAbortOnEndJob(net::URLRequest* request) - : URLRequestJob(request), sent_data_(false), + : URLRequestJob(request, request->context()->network_delegate()), + sent_data_(false), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { } diff --git a/content/test/net/url_request_failed_job.cc b/content/test/net/url_request_failed_job.cc index 9ea08b8..a9efd18 100644 --- a/content/test/net/url_request_failed_job.cc +++ b/content/test/net/url_request_failed_job.cc @@ -10,6 +10,7 @@ #include "base/string_number_conversions.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_filter.h" namespace { @@ -42,7 +43,7 @@ GURL GetMockUrl(const std::string& scheme, int net_error) { URLRequestFailedJob::URLRequestFailedJob(net::URLRequest* request, int net_error) - : net::URLRequestJob(request), + : net::URLRequestJob(request, request->context()->network_delegate()), net_error_(net_error), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} diff --git a/content/test/net/url_request_slow_download_job.cc b/content/test/net/url_request_slow_download_job.cc index 0af0441..5fc435d 100644 --- a/content/test/net/url_request_slow_download_job.cc +++ b/content/test/net/url_request_slow_download_job.cc @@ -15,6 +15,7 @@ #include "net/base/io_buffer.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_filter.h" using content::BrowserThread; @@ -79,7 +80,7 @@ void URLRequestSlowDownloadJob::FinishPendingRequests() { } URLRequestSlowDownloadJob::URLRequestSlowDownloadJob(net::URLRequest* request) - : net::URLRequestJob(request), + : net::URLRequestJob(request, request->context()->network_delegate()), bytes_already_sent_(0), should_finish_download_(false), buffer_size_(0), -- cgit v1.1