Revert of Introduce an intra-priority level sorting value - Chromium Side

content/browser/loader/resource_scheduler_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 "content/browser/loader/resource_scheduler.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/browser_thread_impl.h"
@@ skipping 171 matching lines @@
     TestRequest* request = new TestRequest(throttle.Pass(), url_request.Pass());
     request->Start();
     return request;
   }
 
   TestRequest* NewRequest(const char* url, net::RequestPriority priority) {
     return NewRequestWithRoute(url, priority, kRouteId);
   }
 
   void ChangeRequestPriority(TestRequest* request,
-                             net::RequestPriority new_priority,
-                             int intra_priority = 0) {
+                             net::RequestPriority new_priority) {
     scoped_refptr<FakeResourceMessageFilter> filter(
         new FakeResourceMessageFilter(kChildId));
     const ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(
         request->url_request());
     const GlobalRequestID& id = info->GetGlobalRequestID();
-    ResourceHostMsg_DidChangePriority msg(id.request_id, new_priority,
-                                          intra_priority);
+    ResourceHostMsg_DidChangePriority msg(id.request_id, new_priority);
     bool ok = false;
     rdh_.OnMessageReceived(msg, filter.get(), &ok);
     EXPECT_TRUE(ok);
   }
 
   int next_request_id_;
   base::MessageLoopForIO message_loop_;
   BrowserThreadImpl ui_thread_;
   BrowserThreadImpl io_thread_;
   ResourceDispatcherHostImpl rdh_;
@@ skipping 238 matching lines @@
 
   ChangeRequestPriority(request.get(), net::LOWEST);
   EXPECT_FALSE(request->started());
   EXPECT_FALSE(idle->started());
 
   scheduler_.OnWillInsertBody(kChildId, kRouteId);
   EXPECT_FALSE(request->started());
   EXPECT_FALSE(idle->started());
 }
 
-TEST_F(ResourceSchedulerTest, HigherIntraPriorityGoesToFrontOfQueue) {
-  // Dummies to enforce scheduling.
-  scoped_ptr<TestRequest> high(NewRequest("http://host/high", net::HIGHEST));
-  scoped_ptr<TestRequest> low(NewRequest("http://host/high", net::LOWEST));
-
-  const int kMaxNumDelayableRequestsPerClient = 10;  // Should match the .cc.
-  ScopedVector<TestRequest> lows;
-  for (int i = 0; i < kMaxNumDelayableRequestsPerClient; ++i) {
-    string url = "http://host/low" + base::IntToString(i);
-    lows.push_back(NewRequest(url.c_str(), net::IDLE));
-  }
-
-  scoped_ptr<TestRequest> request(NewRequest("http://host/req", net::IDLE));
-  EXPECT_FALSE(request->started());
-
-  ChangeRequestPriority(request.get(), net::IDLE, 1);
-  EXPECT_FALSE(request->started());
-
-  scheduler_.OnWillInsertBody(kChildId, kRouteId);
-  EXPECT_TRUE(request->started());
-}
-
 TEST_F(ResourceSchedulerTest, NonHTTPSchedulesImmediately) {
   // Dummies to enforce scheduling.
   scoped_ptr<TestRequest> high(NewRequest("http://host/high", net::HIGHEST));
   scoped_ptr<TestRequest> low(NewRequest("http://host/high", net::LOWEST));
 
   scoped_ptr<TestRequest> request(
       NewRequest("chrome-extension://req", net::LOWEST));
   EXPECT_TRUE(request->started());
 }
 
 TEST_F(ResourceSchedulerTest, SpdyProxySchedulesImmediately) {
   scoped_ptr<TestRequest> high(NewRequest("http://host/high", net::HIGHEST));
   scoped_ptr<TestRequest> low(NewRequest("http://host/low", net::LOWEST));
 
   scoped_ptr<TestRequest> request(NewRequest("http://host/req", net::IDLE));
   EXPECT_FALSE(request->started());
 
   scheduler_.OnReceivedSpdyProxiedHttpResponse(kChildId, kRouteId);
   EXPECT_TRUE(request->started());
 
   scoped_ptr<TestRequest> after(NewRequest("http://host/after", net::IDLE));
   EXPECT_TRUE(after->started());
 }
 
 }  // unnamed namespace
 
 }  // namespace content