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

2 files changed, 12 insertions, 12 deletions

diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index 860f10c..a52859f 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -2197,8 +2197,8 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, RedirectGetRequest) {
   TestDelegate d;
   {
     SpdyURLRequestContext spdy_url_request_context;
-    net::URLRequest r(GURL("http://www.google.com/"), &d);
-    r.set_context(&spdy_url_request_context);
+    net::URLRequest r(
+        GURL("http://www.google.com/"), &d, &spdy_url_request_context);
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(data.get());
     spdy_url_request_context.socket_factory().
@@ -2453,8 +2453,8 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, RedirectServerPush) {
   TestDelegate d2;
   SpdyURLRequestContext spdy_url_request_context;
   {
-    net::URLRequest r(GURL("http://www.google.com/"), &d);
-    r.set_context(&spdy_url_request_context);
+    net::URLRequest r(
+        GURL("http://www.google.com/"), &d, &spdy_url_request_context);
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(data.get());
 
@@ -2465,8 +2465,8 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, RedirectServerPush) {
     std::string contents("hello!");
     EXPECT_EQ(contents, d.data_received());
 
-    net::URLRequest r2(GURL("http://www.google.com/foo.dat"), &d2);
-    r2.set_context(&spdy_url_request_context);
+    net::URLRequest r2(
+        GURL("http://www.google.com/foo.dat"), &d2, &spdy_url_request_context);
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(data2.get());
 
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index 56f5fd5..4eca577 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -2768,8 +2768,8 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, RedirectGetRequest) {
   TestDelegate d;
   {
     SpdyURLRequestContext spdy_url_request_context;
-    net::URLRequest r(GURL("http://www.google.com/"), &d);
-    r.set_context(&spdy_url_request_context);
+    net::URLRequest r(
+        GURL("http://www.google.com/"), &d, &spdy_url_request_context);
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(data.get());
     spdy_url_request_context.socket_factory().
@@ -3026,8 +3026,8 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, RedirectServerPush) {
   TestDelegate d2;
   SpdyURLRequestContext spdy_url_request_context;
   {
-    net::URLRequest r(GURL("http://www.google.com/"), &d);
-    r.set_context(&spdy_url_request_context);
+    net::URLRequest r(
+        GURL("http://www.google.com/"), &d, &spdy_url_request_context);
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(data.get());
 
@@ -3038,8 +3038,8 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, RedirectServerPush) {
     std::string contents("hello!");
     EXPECT_EQ(contents, d.data_received());
 
-    net::URLRequest r2(GURL("http://www.google.com/foo.dat"), &d2);
-    r2.set_context(&spdy_url_request_context);
+    net::URLRequest r2(
+        GURL("http://www.google.com/foo.dat"), &d2, &spdy_url_request_context);
     spdy_url_request_context.socket_factory().
         AddSocketDataProvider(data2.get());