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

net/url_request/url_request_job.h

Index: net/url_request/url_request_job.h
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 0af7fa1e446176eb0df9304a562f7a230ff5ce1d..6d19491a156a1e6879ff9810f938d80c9484f842 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -5,13 +5,14 @@
 #ifndef NET_URL_REQUEST_URL_REQUEST_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_JOB_H_
 
+#include <map>

[vandebo (ex-Chrome), 2012/10/30 20:41:24]

extra

[Hongbo Min, 2012/10/31 12:52:50]

It is not extra. It is required now because we only include power_observer.h
file.

[vandebo (ex-Chrome), 2012/10/31 17:30:34]

I don't see map being used in this file.  What needs it?

 #include <string>
 #include <vector>
 
 #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"
@@ -37,7 +38,7 @@ 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);
@@ -186,7 +187,7 @@ class NET_EXPORT URLRequestJob : public base::RefCounted<URLRequestJob>,
   // 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;