| Index: content/browser/loader/resource_scheduler_unittest.cc
|
| diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc
|
| index e677f8f12d8c6d7297c4a081b29764e53f032ee5..912c2bb37e819f9e68091a2e96ba50ba3994b8ae 100644
|
| --- a/content/browser/loader/resource_scheduler_unittest.cc
|
| +++ b/content/browser/loader/resource_scheduler_unittest.cc
|
| @@ -189,15 +189,13 @@
|
| }
|
|
|
| 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);
|
| @@ -456,28 +454,6 @@
|
| 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));
|
|
|