Added URLRequestContext to constructor for URLRequest.

chrome/browser/chromeos/gview_request_interceptor_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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
@@ skipping 144 matching lines @@
         pdf_path_, &info);
     ASSERT_EQ(want_loaded, is_loaded);
   }
 
   void SetupRequest(net::URLRequest* request) {
     content::ResourceRequestInfo::AllocateForTesting(request,
                                                      ResourceType::MAIN_FRAME,
                                                      &resource_context_,
                                                      -1,
                                                      -1);
-    request->set_context(resource_context_.GetRequestContext());
   }
 
  protected:
   base::ShadowingAtExitManager at_exit_manager_;  // Deletes PluginService.
   MessageLoopForIO message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
   webkit::npapi::MockPluginList plugin_list_;
   TestingPrefService prefs_;
   scoped_refptr<PluginPrefs> plugin_prefs_;
   net::URLRequestJobFactory job_factory_;
   const net::URLRequestJobFactory* old_factory_;
   TestDelegate test_delegate_;
   FilePath pdf_path_;
   content::MockResourceContext resource_context_;
 };
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptHtml) {
-  net::URLRequest request(GURL(kHtmlUrl), &test_delegate_);
+  net::URLRequest request(
+      GURL(kHtmlUrl), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kHtmlUrl), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptDownload) {
-  net::URLRequest request(GURL(kPdfUrl), &test_delegate_);
+  net::URLRequest request(
+      GURL(kPdfUrl), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.set_load_flags(net::LOAD_IS_DOWNLOAD);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfUrl), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptPdfWhenEnabled) {
   ASSERT_NO_FATAL_FAILURE(SetPDFPluginLoadedState(true));
   plugin_prefs_->EnablePlugin(true, pdf_path_, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 
-  net::URLRequest request(GURL(kPdfUrl), &test_delegate_);
+  net::URLRequest request(
+      GURL(kPdfUrl), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfUrl), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, InterceptPdfWhenDisabled) {
   ASSERT_NO_FATAL_FAILURE(SetPDFPluginLoadedState(true));
   plugin_prefs_->EnablePlugin(false, pdf_path_, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 
-  net::URLRequest request(GURL(kPdfUrl), &test_delegate_);
+  net::URLRequest request(
+      GURL(kPdfUrl), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfUrlIntercepted), request.url());
 }
 
 #if !defined(GOOGLE_CHROME_BUILD)
 // Official builds have pdf plugin by default, and we cannot unload it, so the
 // test fails. Since pdf plugin is always present, we don't need to run this
 // test.
 TEST_F(GViewRequestInterceptorTest, InterceptPdfWithNoPlugin) {
   ASSERT_NO_FATAL_FAILURE(SetPDFPluginLoadedState(false));
 
-  net::URLRequest request(GURL(kPdfUrl), &test_delegate_);
+  net::URLRequest request(
+      GURL(kPdfUrl), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfUrlIntercepted), request.url());
 }
 #endif
 
 TEST_F(GViewRequestInterceptorTest, InterceptPowerpoint) {
-  net::URLRequest request(GURL(kPptUrl), &test_delegate_);
+  net::URLRequest request(
+      GURL(kPptUrl), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPptUrlIntercepted), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptPost) {
   ASSERT_NO_FATAL_FAILURE(SetPDFPluginLoadedState(false));
 
-  net::URLRequest request(GURL(kPdfUrl), &test_delegate_);
+  net::URLRequest request(
+      GURL(kPdfUrl), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.set_method("POST");
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfUrl), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptBlob) {
   ASSERT_NO_FATAL_FAILURE(SetPDFPluginLoadedState(false));
 
-  net::URLRequest request(GURL(kPdfBlob), &test_delegate_);
+  net::URLRequest request(
+      GURL(kPdfBlob), &test_delegate_, resource_context_.GetRequestContext());
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfBlob), request.url());
 }
 
 }  // namespace
 
 }  // namespace chromeos