Revert 183382

content/common/resource_dispatcher.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/request_extra_data.h"
 #include "content/common/resource_messages.h"
 #include "content/public/common/resource_dispatcher_delegate.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "net/base/request_priority.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/glue/resource_request_body.h"
 #include "webkit/glue/resource_type.h"
 
 using webkit_glue::ResourceLoaderBridge;
 using webkit_glue::ResourceRequestBody;
 using webkit_glue::ResourceResponseInfo;
 
 namespace content {
 
@@ skipping 20 matching lines @@
  public:
   IPCResourceLoaderBridge(ResourceDispatcher* dispatcher,
       const ResourceLoaderBridge::RequestInfo& request_info);
   virtual ~IPCResourceLoaderBridge();
 
   // ResourceLoaderBridge
   virtual void SetRequestBody(ResourceRequestBody* request_body) OVERRIDE;
   virtual bool Start(Peer* peer) OVERRIDE;
   virtual void Cancel() OVERRIDE;
   virtual void SetDefersLoading(bool value) OVERRIDE;
-  virtual void DidChangePriority(net::RequestPriority new_priority) OVERRIDE;
   virtual void SyncLoad(SyncLoadResponse* response) OVERRIDE;
 
  private:
   ResourceLoaderBridge::Peer* peer_;
 
   // The resource dispatcher for this loader.  The bridge doesn't own it, but
   // it's guaranteed to outlive the bridge.
   ResourceDispatcher* dispatcher_;
 
   // The request to send, created on initialization for modification and
@@ skipping 111 matching lines @@
 
 void IPCResourceLoaderBridge::SetDefersLoading(bool value) {
   if (request_id_ < 0) {
     NOTREACHED() << "Trying to (un)defer an unstarted request";
     return;
   }
 
   dispatcher_->SetDefersLoading(request_id_, value);
 }
 
-void IPCResourceLoaderBridge::DidChangePriority(
-    net::RequestPriority new_priority) {
-  if (request_id_ < 0) {
-    NOTREACHED() << "Trying to change priority of an unstarted request";
-    return;
-  }
-
-  dispatcher_->DidChangePriority(routing_id_, request_id_, new_priority);
-}
-
 void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) {
   if (request_id_ != -1) {
     NOTREACHED() << "Starting a request twice";
     response->error_code = net::ERR_FAILED;
     return;
   }
 
   request_id_ = MakeRequestID();
   is_synchronous_request_ = true;
 
@@ skipping 336 matching lines @@
     request_info.is_deferred = false;
 
     FollowPendingRedirect(request_id, request_info);
 
     MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(&ResourceDispatcher::FlushDeferredMessages,
                    weak_factory_.GetWeakPtr(), request_id));
   }
 }
 
-void ResourceDispatcher::DidChangePriority(
-    int routing_id, int request_id, net::RequestPriority new_priority) {
-  DCHECK(ContainsKey(pending_requests_, request_id));
-  message_sender()->Send(new ResourceHostMsg_DidChangePriority(
-      routing_id, request_id, new_priority));
-}
-
 ResourceDispatcher::PendingRequestInfo::PendingRequestInfo()
     : peer(NULL),
       resource_type(ResourceType::SUB_RESOURCE),
       is_deferred(false),
       buffer_size(0) {
 }
 
 ResourceDispatcher::PendingRequestInfo::PendingRequestInfo(
     webkit_glue::ResourceLoaderBridge::Peer* peer,
     ResourceType::Type resource_type,
@@ skipping 164 matching lines @@
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }
 
 }  // namespace content