[Net] Add a priority parameter to URLRequest's constructor

chrome/browser/extensions/extension_protocols_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 "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/constants.h"
+#include "net/base/request_priority.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 scoped_refptr<Extension> CreateTestExtension(const std::string& name,
                                              bool incognito_split_mode) {
@@ skipping 132 matching lines @@
         CreateTestExtension(cases[i].name, cases[i].incognito_split_mode);
     extension_info_map_->AddExtension(
         extension.get(), base::Time::Now(), cases[i].incognito_enabled);
 
     // First test a main frame request.
     {
       // It doesn't matter that the resource doesn't exist. If the resource
       // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request
       // should just fail because the file doesn't exist.
       net::URLRequest request(extension->GetResourceURL("404.html"),
+                              net::DEFAULT_PRIORITY,
                               &test_delegate_,
-                              resource_context_.GetRequestContext());
+                              resource_context_.GetRequestContext(),
+                              NULL);

[mmenke, 2013/10/30 15:27:11]

I don't think we should depend on the resource context's request context having
a NULL delegate.  Just use the request context's CreateRequest function.

[akalin, 2013/10/30 21:44:37]

From our chat, making the 'deprecated' constructor the only one, removing
network_delegate args everywhere.

       StartRequest(&request, ResourceType::MAIN_FRAME);
       EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
 
       if (cases[i].should_allow_main_frame_load) {
         EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
             cases[i].name;
       } else {
         EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
             cases[i].name;
       }
     }
 
     // Now do a subframe request.
     {
       net::URLRequest request(extension->GetResourceURL("404.html"),
+                              net::DEFAULT_PRIORITY,
                               &test_delegate_,
-                              resource_context_.GetRequestContext());
+                              resource_context_.GetRequestContext(),
+                              NULL);
       StartRequest(&request, ResourceType::SUB_FRAME);
       EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
 
       if (cases[i].should_allow_sub_frame_load) {
         EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
             cases[i].name;
       } else {
         EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
             cases[i].name;
       }
@@ skipping 16 matching lines @@
 TEST_F(ExtensionProtocolTest, ComponentResourceRequest) {
   // Register a non-incognito extension protocol handler.
   SetProtocolHandler(false);
 
   scoped_refptr<Extension> extension = CreateWebStoreExtension();
   extension_info_map_->AddExtension(extension.get(), base::Time::Now(), false);
 
   // First test it with the extension enabled.
   {
     net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
+                            net::DEFAULT_PRIORITY,
                             &test_delegate_,
-                            resource_context_.GetRequestContext());
+                            resource_context_.GetRequestContext(),
+                            NULL);
     StartRequest(&request, ResourceType::MEDIA);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
     CheckForContentLengthHeader(&request);
   }
 
   // And then test it with the extension disabled.
   extension_info_map_->RemoveExtension(extension->id(),
                                        UnloadedExtensionInfo::REASON_DISABLE);
   {
     net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
+                            net::DEFAULT_PRIORITY,
                             &test_delegate_,
-                            resource_context_.GetRequestContext());
+                            resource_context_.GetRequestContext(),
+                            NULL);
     StartRequest(&request, ResourceType::MEDIA);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
     CheckForContentLengthHeader(&request);
   }
 }
 
 // Tests that a URL request for resource from an extension returns a few
 // expected response headers.
 TEST_F(ExtensionProtocolTest, ResourceRequestResponseHeaders) {
   // Register a non-incognito extension protocol handler.
   SetProtocolHandler(false);
 
   scoped_refptr<Extension> extension = CreateTestResponseHeaderExtension();
   extension_info_map_->AddExtension(extension.get(), base::Time::Now(), false);
 
   {
     net::URLRequest request(extension->GetResourceURL("test.dat"),
+                            net::DEFAULT_PRIORITY,
                             &test_delegate_,
-                            resource_context_.GetRequestContext());
+                            resource_context_.GetRequestContext(),
+                            NULL);
     StartRequest(&request, ResourceType::MEDIA);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
 
     // Check that cache-related headers are set.
     std::string etag;
     request.GetResponseHeaderByName("ETag", &etag);
     EXPECT_TRUE(StartsWithASCII(etag, "\"", false));
     EXPECT_TRUE(EndsWith(etag, "\"", false));
 
     std::string revalidation_header;
     request.GetResponseHeaderByName("cache-control", &revalidation_header);
     EXPECT_EQ("no-cache", revalidation_header);
 
     // We set test.dat as web-accessible, so it should have a CORS header.
     std::string access_control;
     request.GetResponseHeaderByName("Access-Control-Allow-Origin",
                                     &access_control);
     EXPECT_EQ("*", access_control);
   }
 }
 
 }  // namespace extensions