Revert 183382

webkit/glue/weburlloader_impl.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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 250 matching lines @@
 
   // Build up the header map.
   void* iter = NULL;
   std::string name;
   while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
     response->addHTTPHeaderField(WebString::fromUTF8(name),
                                  WebString::fromUTF8(value));
   }
 }
 
-net::RequestPriority ConvertWebKitPriorityToNetPriority(
-    const WebURLRequest::Priority& priority) {
-  switch (priority) {
-    case WebURLRequest::PriorityVeryHigh:
-      return net::HIGHEST;
-
-    case WebURLRequest::PriorityHigh:
-      return net::MEDIUM;
-
-    case WebURLRequest::PriorityMedium:
-      return net::LOW;
-
-    case WebURLRequest::PriorityLow:
-      return net::LOWEST;
-
-    case WebURLRequest::PriorityVeryLow:
-      return net::IDLE;
-
-    case WebURLRequest::PriorityUnresolved:
-    default:
-      NOTREACHED();
-      return net::LOW;
-  }
-}
-
 }  // namespace
 
 // WebURLLoaderImpl::Context --------------------------------------------------
 
 // This inner class exists since the WebURLLoader may be deleted while inside a
 // call to WebURLLoaderClient.  The bridge requires its Peer to stay alive
 // until it receives OnCompletedRequest.
 class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
                                   public ResourceLoaderBridge::Peer {
  public:
   explicit Context(WebURLLoaderImpl* loader);
 
   WebURLLoaderClient* client() const { return client_; }
   void set_client(WebURLLoaderClient* client) { client_ = client; }
 
   void Cancel();
   void SetDefersLoading(bool value);
-  void DidChangePriority(WebURLRequest::Priority new_priority);
   void Start(
       const WebURLRequest& request,
       ResourceLoaderBridge::SyncLoadResponse* sync_load_response,
       WebKitPlatformSupportImpl* platform);
 
   // ResourceLoaderBridge::Peer methods:
   virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
   virtual bool OnReceivedRedirect(
       const GURL& new_url,
       const ResourceResponseInfo& info,
@@ skipping 49 matching lines @@
   // Do not make any further calls to the client.
   client_ = NULL;
   loader_ = NULL;
 }
 
 void WebURLLoaderImpl::Context::SetDefersLoading(bool value) {
   if (bridge_.get())
     bridge_->SetDefersLoading(value);
 }
 
-void WebURLLoaderImpl::Context::DidChangePriority(
-    WebURLRequest::Priority new_priority) {
-  if (bridge_.get())
-    bridge_->DidChangePriority(
-        ConvertWebKitPriorityToNetPriority(new_priority));
-}
-
 void WebURLLoaderImpl::Context::Start(
     const WebURLRequest& request,
     ResourceLoaderBridge::SyncLoadResponse* sync_load_response,
     WebKitPlatformSupportImpl* platform) {
   DCHECK(!bridge_.get());
 
   request_ = request;  // Save the request.
 
   GURL url = request.url();
   if (url.SchemeIs("data") && CanHandleDataURL(url)) {
@@ skipping 59 matching lines @@
   request_info.first_party_for_cookies = request.firstPartyForCookies();
   request_info.referrer = referrer_url;
   request_info.headers = flattener.GetBuffer();
   request_info.load_flags = load_flags;
   // requestor_pid only needs to be non-zero if the request originates outside
   // the render process, so we can use requestorProcessID even for requests
   // from in-process plugins.
   request_info.requestor_pid = request.requestorProcessID();
   request_info.request_type =
       ResourceType::FromTargetType(request.targetType());
-  request_info.priority =
-      ConvertWebKitPriorityToNetPriority(request.priority());
+  request_info.priority = request.priority();
   request_info.appcache_host_id = request.appCacheHostID();
   request_info.routing_id = request.requestorID();
   request_info.download_to_file = request.downloadToFile();
   request_info.has_user_gesture = request.hasUserGesture();
   request_info.extra_data = request.extraData();
   if (request.extraData()) {
     referrer_policy_ = static_cast<WebURLRequestExtraDataImpl*>(
         request.extraData())->referrer_policy();
     request_info.referrer_policy = referrer_policy_;
   }
@@ skipping 330 matching lines @@
 }
 
 void WebURLLoaderImpl::cancel() {
   context_->Cancel();
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
-void WebURLLoaderImpl::didChangePriority(WebURLRequest::Priority new_priority) {
-  context_->DidChangePriority(new_priority);
-}
-
 }  // namespace webkit_glue