Eliminate spurious request cancelations

content/child/resource_dispatcher_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/child/resource_dispatcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 621 matching lines @@
   EXPECT_EQ(0u, queued_messages());
 
   // This lets the wrapper peer pass all the messages to the original
   // peer at once, but the original peer cancels right after it receives
   // the response. (This will remove pending request info from
   // ResourceDispatcher while the wrapper peer is still running
   // OnCompletedRequest, but it should not lead to crashes.)
   NotifyRequestComplete(id, strlen(kTestPageContents));
 
   EXPECT_TRUE(peer_context.received_response);
-  // Request should have been cancelled.
-  ConsumeCancelRequest(id);
+  // Request should have been cancelled with no additional messages.
+  EXPECT_EQ(0u, queued_messages());
   EXPECT_TRUE(peer_context.cancelled);
 
   // Any future messages related to the request should be ignored.
   NotifyDataReceived(id, kTestPageContents);
   NotifyRequestComplete(id, strlen(kTestPageContents));
 
   EXPECT_EQ(0u, queued_messages());
   EXPECT_EQ("", peer_context.data);
   EXPECT_FALSE(peer_context.complete);
 }
@@ skipping 282 matching lines @@
   ResourceResponseHead response_head;
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 }  // namespace content