SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor

net/url_request/url_request_job.h

 // 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_JOB_H_
 
 #include <string>
 #include <vector>
+#include <map>

[willchan no longer on Chromium, 2012/10/12 18:17:15]

alphabetical order please

[Hongbo Min, 2012/10/13 06:36:07]

Done.

 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/power_monitor/power_observer.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/filter.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"
 #include "net/base/upload_progress.h"
 #include "net/cookies/canonical_cookie.h"
 
 namespace net {
 
 class AuthChallengeInfo;
 class AuthCredentials;
 class CookieOptions;
 class HttpRequestHeaders;
 class HttpResponseInfo;
 class IOBuffer;
 class NetworkDelegate;
 class SSLCertRequestInfo;
 class SSLInfo;
 class URLRequest;
 class UploadData;
 class URLRequestStatus;
 class X509Certificate;
 
 class NET_EXPORT URLRequestJob : public base::RefCounted<URLRequestJob>,
-                                 public base::SystemMonitor::PowerObserver {
+                                 public base::PowerObserver {
  public:
   explicit URLRequestJob(URLRequest* request,
                          NetworkDelegate* network_delegate);
 
   // Returns the request that owns this job. THIS POINTER MAY BE NULL if the
   // request was destroyed.
   URLRequest* request() const {
     return request_;
   }
 
@@ skipping 128 matching lines @@
   bool has_response_started() const { return has_handled_response_; }
 
   // These methods are not applicable to all connections.
   virtual bool GetMimeType(std::string* mime_type) const;
   virtual int GetResponseCode() const;
 
   // Returns the socket address for the connection.
   // See url_request.h for details.
   virtual HostPortPair GetSocketAddress() const;
 
-  // base::SystemMonitor::PowerObserver methods:
+  // base::PowerObserver methods:
   // We invoke URLRequestJob::Kill on suspend (crbug.com/4606).
   virtual void OnSuspend() OVERRIDE;
 
   // Called after a NetworkDelegate has been informed that the URLRequest
   // will be destroyed. This is used to track that no pending callbacks
   // exist at destruction time of the URLRequestJob, unless they have been
   // canceled by an explicit NetworkDelegate::NotifyURLRequestDestroyed() call.
   virtual void NotifyURLRequestDestroyed();
 
  protected:
@@ skipping 179 matching lines @@
   NetworkDelegate* network_delegate_;
 
   base::WeakPtrFactory<URLRequestJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestJob);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_