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

chrome/browser/extensions/api/web_request/web_request_api_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 <map>
 #include <queue>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 24 matching lines @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/features/feature.h"
 #include "net/base/auth.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/net_util.h"
+#include "net/base/request_priority.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest-message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace helpers = extension_web_request_api_helpers;
@@ skipping 178 matching lines @@
 
   net::URLRequestJobFactoryImpl job_factory;
   job_factory.SetProtocolHandler(
       chrome::kAboutScheme,
       new chrome_browser_net::AboutProtocolHandler());
   context_->set_job_factory(&job_factory);
 
   GURL redirect_url("about:redirected");
   GURL not_chosen_redirect_url("about:not_chosen");
 
-  net::URLRequest request(GURL("about:blank"), &delegate_, context_.get());
+  net::URLRequest request(GURL("about:blank"),
+                          net::DEFAULT_PRIORITY,
+                          &delegate_,
+                          context_.get(),
+                          network_delegate_.get());
   {
     // onBeforeRequest will be dispatched twice initially. The second response -
     // the redirect - should win, since it has a later |install_time|. The
     // redirect will dispatch another pair of onBeforeRequest. There, the first
     // response should win (later |install_time|).
     ExtensionWebRequestEventRouter::EventResponse* response = NULL;
 
     // Extension1 response. Arrives first, but ignored due to install_time.
     response = new ExtensionWebRequestEventRouter::EventResponse(
         extension1_id, base::Time::FromDoubleT(1));
@@ skipping 33 matching lines @@
 
     EXPECT_TRUE(!request.is_pending());
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
     EXPECT_EQ(0, request.status().error());
     EXPECT_EQ(redirect_url, request.url());
     EXPECT_EQ(2U, request.url_chain().size());
     EXPECT_EQ(0U, ipc_sender_.GetNumTasks());
   }
 
   // Now test the same thing but the extensions answer in reverse order.
-  net::URLRequest request2(GURL("about:blank"), &delegate_, context_.get());
+  net::URLRequest request2(GURL("about:blank"),
+                           net::DEFAULT_PRIORITY,
+                           &delegate_,
+                           context_.get(),
+                           network_delegate_.get());
   {
     ExtensionWebRequestEventRouter::EventResponse* response = NULL;
 
     // Extension2 response. Arrives first, and chosen because of install_time.
     response = new ExtensionWebRequestEventRouter::EventResponse(
         extension2_id, base::Time::FromDoubleT(2));
     response->new_url = redirect_url;
     ipc_sender_.PushTask(
         base::Bind(&EventHandledOnIOThread,
             &profile_, extension2_id, kEventName, kEventName + "/2",
@@ skipping 52 matching lines @@
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
     &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
     filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1,
     ipc_sender_factory.GetWeakPtr());
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
     &profile_, extension2_id, extension2_id, kEventName, kEventName + "/2",
     filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1,
     ipc_sender_factory.GetWeakPtr());
 
   GURL request_url("about:blank");
-  net::URLRequest request(request_url, &delegate_, context_.get());
+  net::URLRequest request(request_url,
+                          net::DEFAULT_PRIORITY,
+                          &delegate_,
+                          context_.get(),
+                          network_delegate_.get());
 
   // onBeforeRequest will be dispatched twice. The second response -
   // the redirect - would win, since it has a later |install_time|, but
   // the first response takes precedence because cancel >> redirect.
   GURL redirect_url("about:redirected");
   ExtensionWebRequestEventRouter::EventResponse* response = NULL;
 
   // Extension1 response. Arrives first, would be ignored in principle due to
   // install_time but "cancel" always wins.
   response = new ExtensionWebRequestEventRouter::EventResponse(
@@ skipping 46 matching lines @@
   base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
     &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
     filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1,
     ipc_sender_factory.GetWeakPtr());
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
     &profile_, extension_id, extension_id, kEventName2, kEventName2 + "/1",
     filter, 0, -1, -1, ipc_sender_factory.GetWeakPtr());
 
   GURL request_url("about:blank");
-  net::URLRequest request(request_url, &delegate_, context_.get());
+  net::URLRequest request(request_url,
+                          net::DEFAULT_PRIORITY,
+                          &delegate_,
+                          context_.get(),
+                          network_delegate_.get());
 
   ExtensionWebRequestEventRouter::EventResponse* response = NULL;
 
   // Extension response for the OnBeforeRequest handler. This should not be
   // processed because request is canceled before the handler responds.
   response = new ExtensionWebRequestEventRouter::EventResponse(
       extension_id, base::Time::FromDoubleT(1));
   GURL redirect_url("about:redirected");
   response->new_url = redirect_url;
   ipc_sender_.PushTask(
@@ skipping 42 matching lines @@
 
 }  // namespace
 
 void ExtensionWebRequestTest::FireURLRequestWithData(
     const std::string& method,
     const char* content_type,
     const std::vector<char>& bytes_1,
     const std::vector<char>& bytes_2) {
   // The request URL can be arbitrary but must have an HTTP or HTTPS scheme.
   GURL request_url("http://www.example.com");
-  net::URLRequest request(request_url, &delegate_, context_.get());
+  net::URLRequest request(request_url,
+                          net::DEFAULT_PRIORITY,
+                          &delegate_,
+                          context_.get(),
+                          network_delegate_.get());
   request.set_method(method);
   if (content_type != NULL)
     request.SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType,
                                         content_type,
                                         true /* overwrite */);
   ScopedVector<net::UploadElementReader> element_readers;
   element_readers.push_back(new net::UploadBytesElementReader(
       &(bytes_1[0]), bytes_1.size()));
   element_readers.push_back(
       new net::UploadFileElementReader(base::MessageLoopProxy::current().get(),
@@ skipping 192 matching lines @@
 
   // Subscribe to OnBeforeRequest with requestBody requirement.
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
       &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
       filter, extra_info_spec, -1, -1, ipc_sender_factory.GetWeakPtr());
 
   // The request URL can be arbitrary but must have an HTTP or HTTPS scheme.
   const GURL request_url("http://www.example.com");
 
   for (size_t i = 0; i < arraysize(kMethods); ++i) {
-    net::URLRequest request(request_url, &delegate_, context_.get());
+    net::URLRequest request(request_url,
+                            net::DEFAULT_PRIORITY,
+                            &delegate_,
+                            context_.get(),
+                            network_delegate_.get());
     request.set_method(kMethods[i]);
     ipc_sender_.PushTask(base::Bind(&base::DoNothing));
     request.Start();
   }
 
   // We inspect the result in the message list of |ipc_sender_| later.
   base::MessageLoop::current()->RunUntilIdle();
 
   ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
       &profile_, extension_id, kEventName + "/1");
@@ skipping 98 matching lines @@
       ipc_sender_factory.GetWeakPtr());
 
   // Install one extension that observes the final headers.
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
       &profile_, extension3_id, extension3_id, keys::kOnSendHeadersEvent,
       std::string(keys::kOnSendHeadersEvent) + "/3", filter,
       ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_HEADERS, -1, -1,
       ipc_sender_factory.GetWeakPtr());
 
   GURL request_url("http://doesnotexist/does_not_exist.html");
-  net::URLRequest request(request_url, &delegate_, context_.get());
+  net::URLRequest request(request_url,
+                          net::DEFAULT_PRIORITY,
+                          &delegate_,
+                          context_.get(),
+                          network_delegate_.get());
 
   // Initialize headers available before extensions are notified of the
   // onBeforeSendHeaders event.
   HeaderModificationTest test = GetParam();
   net::HttpRequestHeaders before_headers;
   for (int i = 0; i < test.before_size; ++i)
     before_headers.SetHeader(test.before[i].name, test.before[i].value);
   request.SetExtraRequestHeaders(before_headers);
 
   // Gather the modifications to the headers for the respective extensions.
@@ skipping 1287 matching lines @@
   EXPECT_TRUE(credentials_set);
   EXPECT_FALSE(auth3.Empty());
   EXPECT_EQ(username, auth1.username());
   EXPECT_EQ(password, auth1.password());
   EXPECT_EQ(1u, warning_set.size());
   EXPECT_TRUE(HasWarning(warning_set, "extid2"));
   EXPECT_EQ(3u, capturing_net_log.GetSize());
 }
 
 }  // namespace extensions