Added URLRequestContext to constructor for URLRequest.

net/url_request/url_request_job_factory_unittest.cc

 // 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.
 
 #include "net/url_request/url_request_job_factory.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 70 matching lines @@
     return handle_all_protocols_;
   }
 
   mutable bool did_intercept_;
   mutable bool handle_all_protocols_;
 };
 
 TEST(URLRequestJobFactoryTest, NoProtocolHandler) {
   TestDelegate delegate;
   TestURLRequestContext request_context;
-  TestURLRequest request(GURL("foo://bar"), &delegate);
-  request.set_context(&request_context);
+  TestURLRequest request(GURL("foo://bar"), &delegate, &request_context);
   request.Start();
 
   MessageLoop::current()->Run();
   EXPECT_EQ(URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(ERR_UNKNOWN_URL_SCHEME, request.status().error());
 }
 
 TEST(URLRequestJobFactoryTest, BasicProtocolHandler) {
   TestDelegate delegate;
   URLRequestJobFactory job_factory;
   TestURLRequestContext request_context;
   request_context.set_job_factory(&job_factory);
   job_factory.SetProtocolHandler("foo", new DummyProtocolHandler);
-  TestURLRequest request(GURL("foo://bar"), &delegate);
-  request.set_context(&request_context);
+  TestURLRequest request(GURL("foo://bar"), &delegate, &request_context);
   request.Start();
 
   MessageLoop::current()->Run();
   EXPECT_EQ(URLRequestStatus::SUCCESS, request.status().status());
   EXPECT_EQ(OK, request.status().error());
 }
 
 TEST(URLRequestJobFactoryTest, DeleteProtocolHandler) {
   URLRequestJobFactory job_factory;
   TestURLRequestContext request_context;
   request_context.set_job_factory(&job_factory);
   job_factory.SetProtocolHandler("foo", new DummyProtocolHandler);
   job_factory.SetProtocolHandler("foo", NULL);
 }
 
 TEST(URLRequestJobFactoryTest, BasicInterceptor) {
   TestDelegate delegate;
   URLRequestJobFactory job_factory;
   TestURLRequestContext request_context;
   request_context.set_job_factory(&job_factory);
   job_factory.AddInterceptor(new DummyInterceptor);
-  TestURLRequest request(GURL("http://bar"), &delegate);
-  request.set_context(&request_context);
+  TestURLRequest request(GURL("http://bar"), &delegate, &request_context);
   request.Start();
 
   MessageLoop::current()->Run();
   EXPECT_EQ(URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(ERR_FAILED, request.status().error());
 }
 
 TEST(URLRequestJobFactoryTest, InterceptorNeedsValidSchemeStill) {
   TestDelegate delegate;
   URLRequestJobFactory job_factory;
   TestURLRequestContext request_context;
   request_context.set_job_factory(&job_factory);
   job_factory.AddInterceptor(new DummyInterceptor);
-  TestURLRequest request(GURL("foo://bar"), &delegate);
-  request.set_context(&request_context);
+  TestURLRequest request(GURL("foo://bar"), &delegate, &request_context);
   request.Start();
 
   MessageLoop::current()->Run();
   EXPECT_EQ(URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(ERR_UNKNOWN_URL_SCHEME, request.status().error());
 }
 
 TEST(URLRequestJobFactoryTest, InterceptorOverridesProtocolHandler) {
   TestDelegate delegate;
   URLRequestJobFactory job_factory;
   TestURLRequestContext request_context;
   request_context.set_job_factory(&job_factory);
   job_factory.SetProtocolHandler("foo", new DummyProtocolHandler);
   job_factory.AddInterceptor(new DummyInterceptor);
-  TestURLRequest request(GURL("foo://bar"), &delegate);
-  request.set_context(&request_context);
+  TestURLRequest request(GURL("foo://bar"), &delegate, &request_context);
   request.Start();
 
   MessageLoop::current()->Run();
   EXPECT_EQ(URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(ERR_FAILED, request.status().error());
 }
 
 TEST(URLRequestJobFactoryTest, InterceptorDoesntInterceptUnknownProtocols) {
   TestDelegate delegate;
   URLRequestJobFactory job_factory;
   TestURLRequestContext request_context;
   request_context.set_job_factory(&job_factory);
   DummyInterceptor* interceptor = new DummyInterceptor;
   job_factory.AddInterceptor(interceptor);
-  TestURLRequest request(GURL("foo://bar"), &delegate);
-  request.set_context(&request_context);
+  TestURLRequest request(GURL("foo://bar"), &delegate, &request_context);
   request.Start();
 
   MessageLoop::current()->Run();
   EXPECT_FALSE(interceptor->did_intercept_);
 }
 
 TEST(URLRequestJobFactoryTest, InterceptorInterceptsHandledUnknownProtocols) {
   TestDelegate delegate;
   URLRequestJobFactory job_factory;
   TestURLRequestContext request_context;
   request_context.set_job_factory(&job_factory);
   DummyInterceptor* interceptor = new DummyInterceptor;
   interceptor->handle_all_protocols_ = true;
   job_factory.AddInterceptor(interceptor);
-  TestURLRequest request(GURL("foo://bar"), &delegate);
-  request.set_context(&request_context);
+  TestURLRequest request(GURL("foo://bar"), &delegate, &request_context);
   request.Start();
 
   MessageLoop::current()->Run();
   EXPECT_TRUE(interceptor->did_intercept_);
   EXPECT_EQ(URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(ERR_FAILED, request.status().error());
 }
 
 TEST(URLRequestJobFactoryTest, InterceptorAffectsIsHandledProtocol) {
   DummyInterceptor* interceptor = new DummyInterceptor;
   URLRequestJobFactory job_factory;
   job_factory.AddInterceptor(interceptor);
   EXPECT_FALSE(interceptor->WillHandleProtocol("anything"));
   EXPECT_FALSE(job_factory.IsHandledProtocol("anything"));
   interceptor->handle_all_protocols_ = true;
   EXPECT_TRUE(interceptor->WillHandleProtocol("anything"));
   EXPECT_TRUE(job_factory.IsHandledProtocol("anything"));
 }
 
 }  // namespace
 
 }  // namespace net