summaryrefslogtreecommitdiffstats
path: root/webkit/blob
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 15:26:13 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 15:26:13 +0000
commit94e2bbe39fe667dd072755c0310fe42f73e0bb66 (patch)
treea7ecb732c9cfabad2332dda3827c18ca7ae83bb6 /webkit/blob
parentd6effdd6a54173c0e11240fb753cc167f2499b34 (diff)
downloadchromium_src-94e2bbe39fe667dd072755c0310fe42f73e0bb66.zip
chromium_src-94e2bbe39fe667dd072755c0310fe42f73e0bb66.tar.gz
chromium_src-94e2bbe39fe667dd072755c0310fe42f73e0bb66.tar.bz2
Added URLRequestContext to constructor for URLRequest.
Previously, the context was set using the member function set_context. Note that the context for a URLRequest is not allowed to be null. BUG=81979 TEST=None TBR=ajwong,brettw,vitalybuka,sky Review URL: https://chromiumcodereview.appspot.com/10559036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/blob')
-rw-r--r--webkit/blob/blob_url_request_job_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 515574a..a9462e6 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -22,6 +22,7 @@
#include "net/http/http_request_headers.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_error_job.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/blob/blob_data.h"
@@ -242,7 +243,8 @@ class BlobURLRequestJobTest : public testing::Test {
BlobData* blob_data) {
// This test has async steps.
request_.reset(new net::URLRequest(GURL("blob:blah"),
- url_request_delegate_.get()));
+ url_request_delegate_.get(),
+ &empty_context_));
request_->set_method(method);
blob_url_request_job_ = new BlobURLRequestJob(
request_.get(),
@@ -397,6 +399,7 @@ class BlobURLRequestJobTest : public testing::Test {
scoped_ptr<base::WaitableEvent> test_finished_event_;
std::stack<std::pair<base::Closure, bool> > task_stack_;
+ net::URLRequestContext empty_context_;
scoped_ptr<net::URLRequest> request_;
scoped_ptr<MockURLRequestDelegate> url_request_delegate_;
int expected_status_code_;