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 6d3bbe26f0f8ed694a80b2cdb9c1b53c6ffc2ca1..c4c81a913c5dc29890b38067e5c2ca03a9c3712f 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(); |
@@ -367,6 +373,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", |
@@ -874,6 +884,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(); |
@@ -1475,6 +1500,7 @@ void TestRunner::Reset() { |
delegate_->disableAutoResizeMode(WebSize()); |
delegate_->deleteAllCookies(); |
delegate_->resetScreenOrientation(); |
+ ResetBatteryStatus(); |
} |
dump_editting_callbacks_ = false; |
@@ -2270,6 +2296,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() { |
+ blink::WebBatteryStatus status; |
+ delegate_->didChangeBatteryStatus(status); |
+} |
+ |
void TestRunner::DidAcquirePointerLock() { |
DidAcquirePointerLockInternal(); |
} |