Rationalize WakeLock naming conventions

device/wake_lock/wake_lock_provider.h

Index: device/wake_lock/wake_lock_provider.h
diff --git a/device/wake_lock/wake_lock_provider.h b/device/wake_lock/wake_lock_provider.h
index b3bc9c0321dc31f8f96e29e98789db4b5bfa3009..297c0ee7858903f0bf0479af486ffc36082dd959 100644
--- a/device/wake_lock/wake_lock_provider.h
+++ b/device/wake_lock/wake_lock_provider.h
@@ -9,7 +9,7 @@
 #include "base/single_thread_task_runner.h"
 #include "device/wake_lock/public/interfaces/wake_lock_context.mojom.h"
 #include "device/wake_lock/public/interfaces/wake_lock_provider.mojom.h"
-#include "device/wake_lock/wake_lock_service_context.h"
+#include "device/wake_lock/wake_lock_context.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -32,13 +32,12 @@ class WakeLockProvider : public mojom::WakeLockProvider {
       int context_id,
       mojo::InterfaceRequest<mojom::WakeLockContext> request) override;
 
-  void GetWakeLockWithoutContext(
-      mojom::WakeLockType type,
-      mojom::WakeLockReason reason,
-      const std::string& description,
-      mojom::WakeLockServiceRequest request) override;
+  void GetWakeLockWithoutContext(mojom::WakeLockType type,
+                                 mojom::WakeLockReason reason,
+                                 const std::string& description,
+                                 mojom::WakeLockRequest request) override;
 
-  static bool is_in_service_unittest_;
+  static bool is_in_unittest_;
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;