Move fail on suspend logic from URLRequestJob to TcpClientSocket.

net/url_request/url_request_job.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 "net/url_request/url_request_job.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/power_monitor/power_monitor.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "net/base/auth.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
@@ skipping 132 matching lines @@
     : request_(request),
       done_(false),
       prefilter_bytes_read_(0),
       postfilter_bytes_read_(0),
       has_handled_response_(false),
       expected_content_size_(-1),
       network_delegate_(network_delegate),
       last_notified_total_received_bytes_(0),
       last_notified_total_sent_bytes_(0),
       weak_factory_(this) {
-  base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
-  if (power_monitor)
-    power_monitor->AddObserver(this);
 }
 
 URLRequestJob::~URLRequestJob() {
-  base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
-  if (power_monitor)
-    power_monitor->RemoveObserver(this);
 }
 
 void URLRequestJob::SetUpload(UploadDataStream* upload) {
 }
 
 void URLRequestJob::SetExtraRequestHeaders(const HttpRequestHeaders& headers) {
 }
 
 void URLRequestJob::SetPriority(RequestPriority priority) {
 }
@@ skipping 149 matching lines @@
   HttpResponseHeaders* headers = request_->response_headers();
   if (!headers)
     return -1;
   return headers->response_code();
 }
 
 HostPortPair URLRequestJob::GetSocketAddress() const {
   return HostPortPair();
 }
 
-void URLRequestJob::OnSuspend() {
-  // Most errors generated by the Job come as the result of the one current
-  // operation the job is waiting on returning an error. This event is unusual
-  // in that the Job may have another operation ongoing, or the Job may be idle
-  // and waiting on the next call.
-  //
-  // Need to cancel through the request to make sure everything is notified
-  // of the failure (Particularly that the NetworkDelegate, which the Job may be
-  // waiting on, is notified synchronously) and torn down correctly.
-  //
-  // TODO(mmenke): This should probably fail the request with
-  //               NETWORK_IO_SUSPENDED instead.
-  request_->Cancel();
-}
-
 void URLRequestJob::NotifyURLRequestDestroyed() {
 }
 
 void URLRequestJob::GetConnectionAttempts(ConnectionAttempts* out) const {
   out->clear();
 }
 
 // static
 GURL URLRequestJob::ComputeReferrerForRedirect(
     URLRequest::ReferrerPolicy policy,
@@ skipping 481 matching lines @@
   int64_t total_sent_bytes = GetTotalSentBytes();
   DCHECK_GE(total_sent_bytes, last_notified_total_sent_bytes_);
   if (total_sent_bytes > last_notified_total_sent_bytes_) {
     network_delegate_->NotifyNetworkBytesSent(
         request_, total_sent_bytes - last_notified_total_sent_bytes_);
   }
   last_notified_total_sent_bytes_ = total_sent_bytes;
 }
 
 }  // namespace net