Revert 232802 "[Net] Assert that URLRequests with LOAD_IGNORE_LI..."

trunk/src/content/browser/loader/resource_scheduler.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 "content/browser/loader/resource_scheduler.h"
 
 #include "base/stl_util.h"
 #include "content/common/resource_messages.h"
 #include "content/browser/loader/resource_message_delegate.h"
 #include "content/public/browser/resource_controller.h"
@@ skipping 255 matching lines @@
 }
 
 void ResourceScheduler::StartRequest(ScheduledResourceRequest* request,
                                      Client* client) {
   client->in_flight_requests.insert(request);
   request->Start();
 }
 
 void ResourceScheduler::ReprioritizeRequest(ScheduledResourceRequest* request,
                                             net::RequestPriority new_priority) {
-  if (request->url_request()->load_flags() & net::LOAD_IGNORE_LIMITS) {
-    // We should not be re-prioritizing requests with the
-    // IGNORE_LIMITS flag.
-    NOTREACHED();
-    return;
-  }
   net::RequestPriority old_priority = request->url_request()->priority();
   DCHECK_NE(new_priority, old_priority);
   request->url_request()->SetPriority(new_priority);
   ClientMap::iterator client_it = client_map_.find(request->client_id());
   if (client_it == client_map_.end()) {
     // The client was likely deleted shortly before we received this IPC.
     return;
   }
 
   Client *client = client_it->second;
   if (!client->pending_requests.IsQueued(request)) {
     DCHECK(ContainsKey(client->in_flight_requests, request));
     // Request has already started.
     return;
   }
 
   client->pending_requests.Erase(request);
-  client->pending_requests.Insert(request,
-                                  request->url_request()->priority());
+  client->pending_requests.Insert(request, request->url_request()->priority());
 
   if (new_priority > old_priority) {
     // Check if this request is now able to load at its new priority.
     LoadAnyStartablePendingRequests(client);
   }
 }
 
 void ResourceScheduler::LoadAnyStartablePendingRequests(Client* client) {
   while (!client->pending_requests.IsEmpty()) {
     ScheduledResourceRequest* request = client->pending_requests.FirstMax();
@@ skipping 81 matching lines @@
 
   return true;
 }
 
 ResourceScheduler::ClientId ResourceScheduler::MakeClientId(
     int child_id, int route_id) {
   return (static_cast<ResourceScheduler::ClientId>(child_id) << 32) | route_id;
 }
 
 }  // namespace content