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

remoting/host/token_validator_base.cc

 // Copyright 2014 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 "remoting/host/token_validator_base.h"
 
 #include <stddef.h>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 109 matching lines @@
 const std::string& TokenValidatorBase::token_scope() const {
   return token_scope_;
 }
 
 // URLFetcherDelegate interface.
 void TokenValidatorBase::OnResponseStarted(net::URLRequest* source,
                                            int net_result) {
   DCHECK_NE(net_result, net::ERR_IO_PENDING);
   DCHECK_EQ(request_.get(), source);
 
-  if (net_result != net::OK)
+  if (net_result != net::OK) {
+    // Treat all network errors read errors.
+    OnReadCompleted(request_.get(), net_result);

[mmenke, 2016/12/02 15:20:08]

This is a bug fix.

     return;
+  }
 
   int bytes_read = request_->Read(buffer_.get(), kBufferSize);
-  if (bytes_read > 0)
+  if (bytes_read != net::ERR_IO_PENDING)

[mmenke, 2016/12/02 15:20:08]

Note that doing this in the bytes_read == 0 case is a bug fix, and doing this in
the bytes_read < 0 case is due to the API change.

     OnReadCompleted(request_.get(), bytes_read);
 }
 
 void TokenValidatorBase::OnReadCompleted(net::URLRequest* source,
                                          int net_result) {
   DCHECK_NE(net_result, net::ERR_IO_PENDING);
   DCHECK_EQ(request_.get(), source);
 
   while (net_result > 0) {
     data_.append(buffer_->data(), net_result);
@@ skipping 127 matching lines @@
     return std::string();
   }
 
   std::string shared_secret;
   // Everything is valid, so return the shared secret to the caller.
   dict->GetStringWithoutPathExpansion("access_token", &shared_secret);
   return shared_secret;
 }
 
 }  // namespace remoting