chromeos: Simplify power supply info in PowerLibrary

chrome/browser/automation/testing_automation_provider.h

 // Copyright (c) 2011 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 CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #define CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/importer/importer_list_observer.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_type.h"
 #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;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace webkit {
 struct WebPluginInfo;
 }
 
 // This is an automation provider containing testing calls.
 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);
 
   virtual IPC::Channel::Mode GetChannelMode(bool use_named_interface);
 
   // IPC::Channel::Listener:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
  private:
@@ skipping 1285 matching lines @@
   // Volume.
   void GetVolumeInfo(base::DictionaryValue* args, IPC::Message* reply_message);
 
   void SetVolume(base::DictionaryValue* args, IPC::Message* reply_message);
 
   void SetMute(base::DictionaryValue* args, IPC::Message* reply_message);
 
   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,
                                int target_tab_count,
                                IPC::Message* reply_message);
 
   void WaitForInfoBarCount(int tab_handle,
                            size_t target_count,
                            IPC::Message* reply_message);
 
@@ skipping 48 matching lines @@
   HistoryService::Handle redirect_query_;
 
   content::NotificationRegistrar registrar_;
 
   // Used to enumerate browser profiles.
   scoped_refptr<ImporterList> importer_list_;
 
   // 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);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_