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 2505 matching lines @@
     orientation = WebScreenOrientationPortraitSecondary;
   } else if (orientation_str == "landscape-primary") {
     orientation = WebScreenOrientationLandscapePrimary;
   } else if (orientation_str == "landscape-secondary") {
     orientation = WebScreenOrientationLandscapeSecondary;
   }
 
   delegate_->SetScreenOrientation(orientation);
 }
 
 void TestRunner::DidChangeBatteryStatus(bool charging,

[haraken, 2016/02/09 12:01:21]

Not directly related to this CL, but what's a difference between TestRunner and
window.internals?

Currently a layout test updates the battery status in the following path:

  layout test => TestRunner => WebView => BatteryDispatcher => BatteryStatus

Another (simpler) way to do that would be:

  layout test => window.internals => BatteryDispatcher => BatteryStatus

In this case, we don't need to involve WebView or go back and forth between
Blink <=> content/. So I'm curious why we don't use window.internals here.

[Yuki, 2016/02/12 12:36:14]

I'm not sure, but I guess window.internals is implemented in Blink while
window.testRunner is implemented in content/.  Another guess is that
window.testRunner is dedicated to testing purpose while window.internals is
dedicated to more general purpose?

Anyway, as a long term solution, we'd like to follow the way of
http://crrev.com/1472693004 .

                                         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);
 }
 
 void TestRunner::ResetBatteryStatus() {
-  blink::WebBatteryStatus status;
-  delegate_->DidChangeBatteryStatus(status);
+  web_view_->resetBatteryStatusForTesting();
 }
 
 void TestRunner::DidAcquirePointerLock() {
   DidAcquirePointerLockInternal();
 }
 
 void TestRunner::DidNotAcquirePointerLock() {
   DidNotAcquirePointerLockInternal();
 }
 
@@ skipping 633 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace test_runner