Reland of 'Move content/browser/power_save_blocker to //device/power_save_blocker'

content/browser/android/browser_jni_registrar.cc

Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 3dd22ccd4ba9eba8e80a5c1e6a8aa831e94dc7b7..94d214f07040f49ab0a9517c8c9fcf37a611383b 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -32,13 +32,13 @@
 #include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/browser/media/session/media_session_delegate_android.h"
 #include "content/browser/mojo/service_registrar_android.h"
-#include "content/browser/power_save_blocker_android.h"
 #include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_android.h"
 #include "content/browser/speech/speech_recognizer_impl_android.h"
 #include "content/browser/time_zone_monitor_android.h"
 #include "content/browser/web_contents/web_contents_android.h"
+#include "device/power_save_blocker/power_save_blocker_android.h"
 #include "mojo/android/system/core_impl.h"
 
 namespace {
@@ -63,9 +63,8 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
     {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
     {"DownloadControllerAndroidImpl",
      content::DownloadControllerAndroidImpl::RegisterDownloadController},
-    {"GamepadList",
-     content::GamepadPlatformDataFetcherAndroid::
-         RegisterGamepadPlatformDataFetcherAndroid},
+    {"GamepadList", content::GamepadPlatformDataFetcherAndroid::
+                        RegisterGamepadPlatformDataFetcherAndroid},
     {"HandleViewResources",
      content::CompositedTouchHandleDrawable::RegisterHandleViewResources},
     {"InterstitialPageDelegateAndroid",
@@ -78,7 +77,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
      content::NavigationControllerAndroid::Register},
     {"PopupTouchHandleDrawable",
      content::PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable},
-    {"PowerSaveBlock", content::RegisterPowerSaveBlocker},
     {"RegisterImeAdapter", content::RegisterImeAdapter},
     {"ScreenOrientationProvider",
      content::ScreenOrientationDelegateAndroid::Register},