ResourceLoader: Fix a bunch of double-cancellation/double-error notification cases.

content/browser/loader/resource_loader_unittest.cc

 // Copyright (c) 2013 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_loader.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 906 matching lines @@
   EXPECT_EQ(1, did_finish_loading_);
   EXPECT_EQ(1, raw_ptr_resource_handler_->on_read_completed_called());
   EXPECT_EQ(0, raw_ptr_resource_handler_->on_read_eof());
   EXPECT_EQ(1, raw_ptr_resource_handler_->on_response_completed_called());
 
   EXPECT_EQ(net::ERR_ABORTED,
             raw_ptr_resource_handler_->final_status().error());
   EXPECT_LT(0u, raw_ptr_resource_handler_->body().size());
 }
 
-// This test is broken because ResourceLoader assumes when
-// URLRequest::was_pending() is false, canceling the request will not result in
-// a completion notification.  This isn't the case - whether or not there's a
-// notification depends on whether URLRequestJob::NotifyDone() has been invoked
-// yet - something the URLRequest doesn't even know about, itself. As a result,
-// the ResourceLoader is notified of cancellation twice.
-// TODO(mmenke): Fix this.
-TEST_F(ResourceLoaderTest, DISABLED_SyncCancelOnReceivedEof) {
+TEST_F(ResourceLoaderTest, SyncCancelOnReceivedEof) {
   raw_ptr_resource_handler_->set_on_on_read_eof_result(false);
 
   loader_->StartRequest();
   raw_ptr_resource_handler_->WaitUntilResponseComplete();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, did_receive_response_);
   EXPECT_EQ(1, did_finish_loading_);
   EXPECT_EQ(1, raw_ptr_resource_handler_->on_read_eof());
   EXPECT_EQ(1, raw_ptr_resource_handler_->on_response_completed_called());
 
@@ skipping 72 matching lines @@
 
   EXPECT_EQ(net::ERR_FAILED, raw_ptr_resource_handler_->final_status().error());
   EXPECT_LT(0u, raw_ptr_resource_handler_->body().size());
 }
 
 TEST_F(ResourceLoaderTest, AsyncCancelOnReceivedEof) {
   raw_ptr_resource_handler_->set_defer_on_read_eof(true);
 
   loader_->StartRequest();
   raw_ptr_resource_handler_->WaitUntilDeferred();
-  // Have to spin the message loop for the test to pass - see comment on sync
-  // version of this test for explanation.
-  // TODO(mmenke): Remove this line once that's fixed.
-  base::RunLoop().RunUntilIdle();
   raw_ptr_resource_handler_->CancelWithError(net::ERR_FAILED);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, did_receive_response_);
   EXPECT_EQ(1, did_finish_loading_);
   EXPECT_EQ(1, raw_ptr_resource_handler_->on_read_eof());
   EXPECT_EQ(1, raw_ptr_resource_handler_->on_response_completed_called());
 
   EXPECT_EQ(net::ERR_FAILED, raw_ptr_resource_handler_->final_status().error());
   EXPECT_EQ(test_data(), raw_ptr_resource_handler_->body());
 }
@@ skipping 396 matching lines @@
 
 // Tests that the effective connection type is not set on non-main frame
 // requests.
 TEST_F(EffectiveConnectionTypeResourceLoaderTest, DoesNotBelongToMainFrame) {
   VerifyEffectiveConnectionType(RESOURCE_TYPE_OBJECT, false,
                                 net::EFFECTIVE_CONNECTION_TYPE_3G,
                                 net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN);
 }
 
 }  // namespace content