Add GetWakeLockWithoutContext() in WakeLockContextProvider mojo interface.

services/device/device_service.cc

 // Copyright 2016 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 "services/device/device_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/generic_sensor/sensor_provider_impl.h"
 #include "device/sensors/device_sensor_host.h"
-#include "device/wake_lock/wake_lock_context_provider.h"
+#include "device/wake_lock/wake_lock_provider.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/device/fingerprint/fingerprint.h"
 #include "services/device/power_monitor/power_monitor_message_broadcaster.h"
 #include "services/device/public/cpp/device_features.h"
 #include "services/device/public/interfaces/battery_monitor.mojom.h"
 #include "services/device/time_zone_monitor/time_zone_monitor.h"
 #include "services/service_manager/public/cpp/bind_source_info.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
@@ skipping 70 matching lines @@
       &DeviceService::BindPowerMonitorRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::ScreenOrientationListener>(
       base::Bind(&DeviceService::BindScreenOrientationListenerRequest,
                  base::Unretained(this)));
   if (base::FeatureList::IsEnabled(features::kGenericSensor)) {
     registry_.AddInterface<mojom::SensorProvider>(base::Bind(
         &DeviceService::BindSensorProviderRequest, base::Unretained(this)));
   }
   registry_.AddInterface<mojom::TimeZoneMonitor>(base::Bind(
       &DeviceService::BindTimeZoneMonitorRequest, base::Unretained(this)));
-  registry_.AddInterface<mojom::WakeLockContextProvider>(
-      base::Bind(&DeviceService::BindWakeLockContextProviderRequest,
-                 base::Unretained(this)));
+  registry_.AddInterface<mojom::WakeLockProvider>(base::Bind(
+      &DeviceService::BindWakeLockProviderRequest, base::Unretained(this)));
 
 #if defined(OS_ANDROID)
   registry_.AddInterface(GetJavaInterfaceProvider()
                              ->CreateInterfaceFactory<mojom::BatteryMonitor>());
   registry_.AddInterface(
       GetJavaInterfaceProvider()
           ->CreateInterfaceFactory<mojom::VibrationManager>());
 #else
   registry_.AddInterface<mojom::BatteryMonitor>(base::Bind(
       &DeviceService::BindBatteryMonitorRequest, base::Unretained(this)));
@@ skipping 116 matching lines @@
 }
 
 void DeviceService::BindTimeZoneMonitorRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::TimeZoneMonitorRequest request) {
   if (!time_zone_monitor_)
     time_zone_monitor_ = TimeZoneMonitor::Create(file_task_runner_);
   time_zone_monitor_->Bind(std::move(request));
 }
 
-void DeviceService::BindWakeLockContextProviderRequest(
+void DeviceService::BindWakeLockProviderRequest(
     const service_manager::BindSourceInfo& source_info,
-    mojom::WakeLockContextProviderRequest request) {
-  WakeLockContextProvider::Create(std::move(request), file_task_runner_,
-                                  wake_lock_context_callback_);
+    mojom::WakeLockProviderRequest request) {
+  WakeLockProvider::Create(std::move(request), file_task_runner_,
+                           wake_lock_context_callback_);
 }
 
 #if defined(OS_ANDROID)
 service_manager::InterfaceProvider* DeviceService::GetJavaInterfaceProvider() {
   if (!java_interface_provider_initialized_) {
     service_manager::mojom::InterfaceProviderPtr provider;
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_InterfaceRegistrar_createInterfaceRegistryForContext(
         env, mojo::MakeRequest(&provider).PassMessagePipe().release().value(),
         base::android::GetApplicationContext());
     java_interface_provider_.Bind(std::move(provider));
 
     java_interface_provider_initialized_ = true;
   }
 
   return &java_interface_provider_;
 }
 #endif
 
 }  // namespace device