BASELINE: Update Chromium to 61.0.3163.99

Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 1 insertions, 24 deletions

diff --git a/chromium/base/power_monitor/power_monitor_device_source_android.cc b/chromium/base/power_monitor/power_monitor_device_source_android.cc
index fd5635c1913..5a764759b13 100644
--- a/chromium/base/power_monitor/power_monitor_device_source_android.cc
+++ b/chromium/base/power_monitor/power_monitor_device_source_android.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/power_monitor/power_monitor_device_source_android.h"
-
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "base/power_monitor/power_monitor_source.h"
@@ -36,8 +34,4 @@ bool PowerMonitorDeviceSource::IsOnBatteryPowerImpl() {
   return base::android::Java_PowerMonitor_isBatteryPower(env);
 }
 
-bool RegisterPowerMonitor(JNIEnv* env) {
-  return base::android::RegisterNativesImpl(env);
-}
-
 }  // namespace base
diff --git a/chromium/base/power_monitor/power_monitor_device_source_android.h b/chromium/base/power_monitor/power_monitor_device_source_android.h
deleted file mode 100644
index 024f95ab007..00000000000
--- a/chromium/base/power_monitor/power_monitor_device_source_android.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef BASE_POWER_MONITOR_POWER_MONITOR_DEVICE_SOURCE_ANDROID_H_
-#define BASE_POWER_MONITOR_POWER_MONITOR_DEVICE_SOURCE_ANDROID_H_
-
-#include <jni.h>
-
-namespace base {
-
-// Registers the JNI bindings for PowerMonitorDeviceSource.
-bool RegisterPowerMonitor(JNIEnv* env);
-
-}  // namespace base
-
-#endif  // BASE_POWER_MONITOR_POWER_MONITOR_DEVICE_SOURCE_ANDROID_H_
diff --git a/chromium/base/power_monitor/power_monitor_unittest.cc b/chromium/base/power_monitor/power_monitor_unittest.cc
index a162763a83f..f1c24598740 100644
--- a/chromium/base/power_monitor/power_monitor_unittest.cc
+++ b/chromium/base/power_monitor/power_monitor_unittest.cc
@@ -17,7 +17,7 @@ class PowerMonitorTest : public testing::Test {
     power_monitor_.reset(new PowerMonitor(
         std::unique_ptr<PowerMonitorSource>(power_monitor_source_)));
   }
-  ~PowerMonitorTest() override{};
+  ~PowerMonitorTest() override {}
 
   PowerMonitorTestSource* source() { return power_monitor_source_; }
   PowerMonitor* monitor() { return power_monitor_.get(); }