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

components/test_runner/test_runner.cc

 // Copyright 2014 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.
 
 #include "components/test_runner/test_runner.h"
 
 #include <stddef.h>
 #include <limits>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_preferences.h"
 #include "components/test_runner/web_content_settings.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "gin/arguments.h"
 #include "gin/array_buffer.h"
 #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"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionData.h"
 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceOrientationData.h"
 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
 #include "third_party/WebKit/public/web/WebArrayBuffer.h"
 #include "third_party/WebKit/public/web/WebArrayBufferConverter.h"
@@ skipping 2519 matching lines @@
     orientation = WebScreenOrientationLandscapeSecondary;
   }
 
   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);
+  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() {
   DidAcquirePointerLockInternal();
 }
 
 void TestRunner::DidNotAcquirePointerLock() {
   DidNotAcquirePointerLockInternal();
 }
 
@@ skipping 638 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace test_runner