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 0aab45a81ee5615c60f47a1851c8b748afda5688..3c3c11b965285c06df73f26b1f750d05f7b266f2 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,11 @@ struct WebPluginInfo;
 class TestingAutomationProvider : public AutomationProvider,
                                   public BrowserList::Observer,
                                   public importer::ImporterListObserver,
+#if defined(OS_CHROMEOS)
+                                  public chromeos::PowerLibrary::Observer,

[stevenjb, 2011/10/24 20:36:21]

We should really have a TestingAutomationProviderChromeos class instead of all
these #ifdefs.

At minimum, we should implement a PowerLibrary::Observer class inside the
_chromeos .cc file and forward declare the class here instead of introducing a
conditional include + parent class. Then we can just add a
scoped_ptr<TestingAutomationPowerLibraryObserver> member here.

[Simon Que, 2011/10/24 22:49:48]

Can this be done in a later patch?

[stevenjb, 2011/10/25 02:33:19]

I am reluctant to introduce new #ifdefs into such a key piece of code; adding
the Observer as a member is a small enough change that I really think it is
worth doing instead. Also, in general adding a member is preferable to multiple
inheritance (even though we do it frequently with observers). I'd rather change
that pattern for TestingAutomationProvider sooner rather than later.
(I do agree that creating TestingAutomationProviderChromeos in this patch
doesn't make any sense). 

[Simon Que, 2011/10/25 19:30:47]

I'm having a bit of trouble with this due to the complex dependencies.  Let's
talk about this over chat.

+#endif  // defined(OS_CHROMEOS)
                                   public content::NotificationObserver {
+
  public:
   explicit TestingAutomationProvider(Profile* profile);
 
@@ -1343,6 +1351,10 @@ class TestingAutomationProvider : public AutomationProvider,
   void CaptureProfilePhoto(Browser* browser,
                            DictionaryValue* args,
                            IPC::Message* reply_message);
+
+  // chromeos::PowerLibrary::Observer overrides.
+  virtual void PowerChanged(const chromeos::PowerSupplyStatus& status) OVERRIDE;
+  virtual void SystemResumed() OVERRIDE {}
 #endif  // defined(OS_CHROMEOS)
 
   void WaitForTabCountToBecome(int browser_handle,
@@ -1411,6 +1423,11 @@ class TestingAutomationProvider : public AutomationProvider,
   // The stored data for the ImportSettings operation.
   ImportSettingsData import_settings_data_;
 
+#if defined(OS_CHROMEOS)
+  // Last reported power status.
+  chromeos::PowerSupplyStatus power_status_;
+#endif  // defined(OS_CHROMEOS)

[stevenjb, 2011/10/24 20:36:21]

We should just make this a static variable in the .cc file instead of adding it
to the shared header.

[Simon Que, 2011/10/24 22:49:48]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);
 };