Adding using protobuf based communication for the power information transfer.

Added in gyp rule for building the needed protobuf. Added secondary code path that calls the PopArrayOfBytesAsProto command and then passes the value up to the rest of Chrome. Removed the old code path.

BUG=chromium-os:25489
TEST=Build image using new code path ChromeOS and Chrome.      Then test that is
     working on a device.


Review URL: http://codereview.chromium.org/9318007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125005 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/dbus/power_manager_client.cc

@@ -14,6 +14,7 @@
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/chromeos/dbus/power_supply_properties.pb.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "dbus/bus.h"
@@ -181,12 +182,13 @@ class PowerManagerClientImpl : public PowerManagerClient {
   }
 
   virtual void RequestStatusUpdate(UpdateRequestType update_type) OVERRIDE {
-    dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
-                                 power_manager::kGetAllPropertiesMethod);
+    dbus::MethodCall method_call(
+        power_manager::kPowerManagerInterface,
+        power_manager::kGetPowerSupplyPropertiesMethod);
     power_manager_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&PowerManagerClientImpl::OnGetAllPropertiesMethod,
+        base::Bind(&PowerManagerClientImpl::OnGetPowerSupplyPropertiesMethod,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
@@ -319,29 +321,24 @@ class PowerManagerClientImpl : public PowerManagerClient {
     RequestStatusUpdate(UPDATE_POLL);
   }
 
-  void OnGetAllPropertiesMethod(dbus::Response* response) {
+  void OnGetPowerSupplyPropertiesMethod(dbus::Response* response) {
     if (!response) {
-      LOG(ERROR) << "Error calling " << power_manager::kGetAllPropertiesMethod;
+      LOG(ERROR) << "Error calling "
+                 << power_manager::kGetPowerSupplyPropertiesMethod;
       return;
     }
+
     dbus::MessageReader reader(response);
+    PowerSupplyProperties protobuf;
+    reader.PopArrayOfBytesAsProto(&protobuf);
+
     PowerSupplyStatus status;
-    double unused_battery_voltage = 0.0;
-    double unused_battery_energy = 0.0;
-    double unused_battery_energy_rate = 0.0;
-    if (!reader.PopBool(&status.line_power_on) ||
-        !reader.PopDouble(&unused_battery_energy) ||
-        !reader.PopDouble(&unused_battery_energy_rate) ||
-        !reader.PopDouble(&unused_battery_voltage) ||
-        !reader.PopInt64(&status.battery_seconds_to_empty) ||
-        !reader.PopInt64(&status.battery_seconds_to_full) ||
-        !reader.PopDouble(&status.battery_percentage) ||
-        !reader.PopBool(&status.battery_is_present) ||
-        !reader.PopBool(&status.battery_is_full)) {
-      LOG(ERROR) << "Error reading response from powerd: "
-                 << response->ToString();
-      return;
-    }
+    status.line_power_on = protobuf.line_power_on();
+    status.battery_seconds_to_empty = protobuf.battery_time_to_empty();
+    status.battery_seconds_to_full = protobuf.battery_time_to_full();
+    status.battery_percentage = protobuf.battery_percentage();
+    status.battery_is_present = protobuf.battery_is_present();
+    status.battery_is_full = protobuf.battery_is_charged();
 
     VLOG(1) << "Power status: " << status.ToString();
     FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(status));

chrome/chrome_browser.gypi

@@ -4484,6 +4484,7 @@
             '../third_party/libevent/libevent.gyp:libevent',
             '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
             'browser/chromeos/input_method/input_method.gyp:gencode',
+            'power_supply_properties_proto',
           ],
           'sources!': [
             'browser/background/background_mode_manager_gtk.cc',
@@ -5677,5 +5678,23 @@
       },
       'includes': [ '../build/protoc.gypi' ]
     },
+    {
+      # Protobuf compiler / generator for the PowerSupplyProperties protocol
+      # buffer.
+      'target_name': 'power_supply_properties_proto',
+      'type': 'static_library',
+      'conditions': [
+        ['chromeos==1', {
+         'sources': [
+           '../third_party/cros_system_api/dbus/power_supply_properties.proto',
+         ],
+         'variables': {
+          'proto_in_dir': '../third_party/cros_system_api/dbus/',
+          'proto_out_dir': 'chrome/browser/chromeos/dbus',
+         },
+         'includes': ['../build/protoc.gypi'],
+        }],
+      ],
+    },
   ],
 }