summaryrefslogtreecommitdiffstats
path: root/chrome_frame
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 /chrome_frame
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 'chrome_frame')
-rw-r--r--chrome_frame/test/test_server_test.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index cc52a39..f520eba 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -62,9 +62,10 @@ class ScopedInternet {
class TestURLRequest : public net::URLRequest {
public:
- TestURLRequest(const GURL& url, Delegate* delegate)
- : net::URLRequest(url, delegate) {
- set_context(new TestURLRequestContext());
+ TestURLRequest(const GURL& url,
+ Delegate* delegate,
+ TestURLRequestContext* context)
+ : net::URLRequest(url, delegate, context) {
}
};
@@ -79,7 +80,8 @@ class UrlTaskChain {
MessageLoopForIO loop;
- TestURLRequest r(GURL(url_), &delegate_);
+ TestURLRequestContext context;
+ TestURLRequest r(GURL(url_), &delegate_, &context);
r.Start();
EXPECT_TRUE(r.is_pending());