Battery Status API: add testing support for LayoutTests.

content/shell/renderer/test_runner/test_runner.cc

Index: content/shell/renderer/test_runner/test_runner.cc
diff --git a/content/shell/renderer/test_runner/test_runner.cc b/content/shell/renderer/test_runner/test_runner.cc
index dca6cdd06021eab6afdecef15679a0961e9b237a..045699ad1efe8ab409f8f1487bd9df98ba2b574e 100644
--- a/content/shell/renderer/test_runner/test_runner.cc
+++ b/content/shell/renderer/test_runner/test_runner.cc
@@ -19,6 +19,7 @@
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
+#include "third_party/WebKit/public/platform/WebBatteryStatus.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebDeviceMotionData.h"
@@ -173,6 +174,11 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> {
   void SetMockDeviceMotion(gin::Arguments* args);
   void SetMockDeviceOrientation(gin::Arguments* args);
   void SetMockScreenOrientation(const std::string& orientation);
+  void DidChangeBatteryStatus(bool charging,
+                              double chargingTime,
+                              double dischargingTime,
+                              double level);
+  void ResetBatteryStatus();
   void DidAcquirePointerLock();
   void DidNotAcquirePointerLock();
   void DidLosePointerLock();
@@ -364,6 +370,10 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder(
                  &TestRunnerBindings::SetMockDeviceOrientation)
       .SetMethod("setMockScreenOrientation",
                  &TestRunnerBindings::SetMockScreenOrientation)
+      .SetMethod("didChangeBatteryStatus",
+                 &TestRunnerBindings::DidChangeBatteryStatus)
+      .SetMethod("resetBatteryStatus",
+                 &TestRunnerBindings::ResetBatteryStatus)
       .SetMethod("didAcquirePointerLock",
                  &TestRunnerBindings::DidAcquirePointerLock)
       .SetMethod("didNotAcquirePointerLock",
@@ -866,6 +876,21 @@ void TestRunnerBindings::SetMockScreenOrientation(const std::string& orientation
   runner_->SetMockScreenOrientation(orientation);
 }
 
+void TestRunnerBindings::DidChangeBatteryStatus(bool charging,
+                                                double chargingTime,
+                                                double dischargingTime,
+                                                double level) {
+  if (runner_) {
+    runner_->DidChangeBatteryStatus(charging, chargingTime,
+                                    dischargingTime, level);
+  }
+}
+
+void TestRunnerBindings::ResetBatteryStatus() {
+  if (runner_)
+    runner_->ResetBatteryStatus();
+}
+
 void TestRunnerBindings::DidAcquirePointerLock() {
   if (runner_)
     runner_->DidAcquirePointerLock();
@@ -2237,6 +2262,23 @@ void TestRunner::SetMockScreenOrientation(const std::string& orientation_str) {
   delegate_->setScreenOrientation(orientation);
 }
 
+void TestRunner::DidChangeBatteryStatus(bool charging,
+                                        double chargingTime,
+                                        double dischargingTime,
+                                        double level) {
+  blink::WebBatteryStatus status;
+  status.charging = charging;
+  status.chargingTime = chargingTime;
+  status.dischargingTime = dischargingTime;
+  status.level = level;
+  delegate_->didChangeBatteryStatus(status);
+}
+
+void TestRunner::ResetBatteryStatus() {

[jochen (gone - plz use gerrit), 2014/06/03 11:20:59]

can you call this method from TestRunner::Reset() as well?

[timvolodine, 2014/06/03 15:30:07]

Done.

+  blink::WebBatteryStatus status;
+  delegate_->didChangeBatteryStatus(status);
+}
+
 void TestRunner::DidAcquirePointerLock() {
   DidAcquirePointerLockInternal();
 }