Rationalize WakeLock naming conventions

device/wake_lock/wake_lock_provider.cc

Index: device/wake_lock/wake_lock_provider.cc
diff --git a/device/wake_lock/wake_lock_provider.cc b/device/wake_lock/wake_lock_provider.cc
index bbd4922fd998784cc2f43a77b626944bc547a895..3f2e4a4ece1ea32fdce9c7b46002b9b79d9702d6 100644
--- a/device/wake_lock/wake_lock_provider.cc
+++ b/device/wake_lock/wake_lock_provider.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "device/wake_lock/wake_lock_service_impl.h"
+#include "device/wake_lock/wake_lock.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
@@ -34,8 +34,8 @@ void WakeLockProvider::GetWakeLockContextForID(
     mojo::InterfaceRequest<mojom::WakeLockContext> request) {
   DCHECK(context_id >= 0);
   mojo::MakeStrongBinding(
-      base::MakeUnique<WakeLockServiceContext>(context_id, file_task_runner_,
-                                               native_view_getter_),
+      base::MakeUnique<WakeLockContext>(context_id, file_task_runner_,
+                                        native_view_getter_),
       std::move(request));
 }
 
@@ -43,11 +43,11 @@ void WakeLockProvider::GetWakeLockWithoutContext(
     mojom::WakeLockType type,
     mojom::WakeLockReason reason,
     const std::string& description,
-    mojom::WakeLockServiceRequest request) {
-  // WakeLockServiceImpl owns itself.
-  new WakeLockServiceImpl(std::move(request), type, reason, description,
-                          WakeLockServiceContext::WakeLockInvalidContextId,
-                          native_view_getter_, file_task_runner_);
+    mojom::WakeLockRequest request) {
+  // WakeLock owns itself.
+  new WakeLock(std::move(request), type, reason, description,
+               WakeLockContext::WakeLockInvalidContextId, native_view_getter_,
+               file_task_runner_);
 }
 
 }  // namespace device