Migrates battery_status from content/renderer/ to WebKit/platform/

components/test_runner/test_runner.cc

Index: components/test_runner/test_runner.cc
diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc
index f09284ca54e29c24e54b9130444664ba11df2b55..8830021f3716e97852a0218f2c4b634417f4871f 100644
--- a/components/test_runner/test_runner.cc
+++ b/components/test_runner/test_runner.cc
@@ -26,7 +26,6 @@
 #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/WebPasswordCredential.h"
@@ -2566,17 +2565,12 @@ 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);
+  web_view_->updateBatteryStatusForTesting(
+      charging, chargingTime, dischargingTime, level);

[kinuko, 2016/02/16 10:09:18]

Now that we have most code in blink do we need to go through test runner code?

[Yuki, 2016/02/16 13:21:58]

Our plan is to follow the way of http://crrev.com/1472693004 once it gets
avaiable.  When it's available, we will no longer need window.testRunner nor
window.internals.

For the time being, I'd like to minimize the effort to support the tests.

 }
 
 void TestRunner::ResetBatteryStatus() {
-  blink::WebBatteryStatus status;
-  delegate_->DidChangeBatteryStatus(status);
+  web_view_->resetBatteryStatusForTesting();
 }
 
 void TestRunner::DidAcquirePointerLock() {