chromeos: Simplify power supply info in PowerLibrary

chrome/browser/automation/testing_automation_provider.h

Index: chrome/browser/automation/testing_automation_provider.h
diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
index 9c8877b573b001892feb2eb9d5fd2a7b67a9f1f1..32a85b4bdbd4774693b28be4730e702509ab9ea2 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -22,6 +22,10 @@
 #include "net/base/cert_status_flags.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros/power_library.h"
+#endif  // defined(OS_CHROMEOS)
+
 class ImporterList;
 class TemplateURLService;
 
@@ -37,7 +41,9 @@ struct WebPluginInfo;
 class TestingAutomationProvider : public AutomationProvider,
                                   public BrowserList::Observer,
                                   public importer::ImporterListObserver,
-                                  public content::NotificationObserver {
+                                  public content::NotificationObserver,
+                                  public chromeos::PowerLibrary::Observer {

[satorux1, 2011/10/21 19:36:50]

This needs to be #if defined(OS_CHROMEOS). I'd suggest to have this before
public "content::NotificationObserver", that'll make it a bit simpler.

[Simon Que, 2011/10/21 20:55:31]

Done.

+
  public:
   explicit TestingAutomationProvider(Profile* profile);
 
@@ -47,6 +53,9 @@ class TestingAutomationProvider : public AutomationProvider,
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
+  virtual void PowerChanged(const chromeos::PowerSupplyStatus& status) OVERRIDE;

[satorux1, 2011/10/21 19:36:50]

Add this.

// chromeos::PowerLibrary::Observer overrides.

[Simon Que, 2011/10/21 20:55:31]

Done.

+  virtual void SystemResumed() OVERRIDE {}

[satorux1, 2011/10/21 19:36:50]

Ditto. This needs to be in #if defined(OS_CHROMEOS). Move this to below where
#if defined(OS_CHROMEOS) is already present.

[Simon Que, 2011/10/21 20:55:31]

Done

+
  private:
   class PopupMenuWaiter;
 
@@ -1410,6 +1419,9 @@ class TestingAutomationProvider : public AutomationProvider,
   // The stored data for the ImportSettings operation.
   ImportSettingsData import_settings_data_;
 
+  // Last reported power status.
+  chromeos::PowerSupplyStatus power_status_;
+
   DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);
 };