summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/file_system_url_request_job_unittest.cc
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/fileapi/file_system_url_request_job_unittest.cc
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/fileapi/file_system_url_request_job_unittest.cc')
-rw-r--r--webkit/fileapi/file_system_url_request_job_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc
index 1b713f9..c52dc94 100644
--- a/webkit/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_url_request_job_unittest.cc
@@ -110,7 +110,8 @@ class FileSystemURLRequestJobTest : public testing::Test {
// Make delegate_ exit the MessageLoop when the request is done.
delegate_->set_quit_on_complete(true);
delegate_->set_quit_on_redirect(true);
- request_.reset(new net::URLRequest(url, delegate_.get()));
+ request_.reset(
+ new net::URLRequest(url, delegate_.get(), &empty_context_));
if (headers)
request_->SetExtraRequestHeaders(*headers);
ASSERT_TRUE(!job_);
@@ -209,6 +210,8 @@ class FileSystemURLRequestJobTest : public testing::Test {
scoped_refptr<FileSystemContext> file_system_context_;
base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_;
+ net::URLRequestContext empty_context_;
+
// NOTE: order matters, request must die before delegate
scoped_ptr<TestDelegate> delegate_;
scoped_ptr<net::URLRequest> request_;