Rationalize WakeLock naming conventions

device/wake_lock/public/interfaces/wake_lock.mojom

Index: device/wake_lock/public/interfaces/wake_lock.mojom
diff --git a/device/wake_lock/public/interfaces/wake_lock_service.mojom b/device/wake_lock/public/interfaces/wake_lock.mojom
similarity index 58%
rename from device/wake_lock/public/interfaces/wake_lock_service.mojom
rename to device/wake_lock/public/interfaces/wake_lock.mojom
index aa3b1daf199d4755ae82f8979ff62c010a646ba9..36e98bee7f22034ddbf2688d829ae5263ec4b818 100644
--- a/device/wake_lock/public/interfaces/wake_lock_service.mojom
+++ b/device/wake_lock/public/interfaces/wake_lock.mojom
@@ -4,8 +4,8 @@
 
 module device.mojom;
 
-// WebLockService receives wake lock preferences from its client.
-interface WakeLockService {
+// WakeLock receives wake lock preferences from its client.
+interface WakeLock {
   // Requests that a wake lock be applied on behalf of this client. Has no
   // effect if the client has previously called this method without
   // subsequently calling CancelWakeLock().
@@ -16,12 +16,12 @@ interface WakeLockService {
   // there is one) will be turned off.
   CancelWakeLock();
 
-  // Adds a client to this WakeLockService instance. Clients are grouped on a
-  // per-WakeLockService instance basis: that is, a given WakeLockService
-  // instance turns on its wake lock whenever *any* of its clients make a
-  // request to do so and turns off its wake lock only when *all* its clients
-  // that had previously called RequestWakelock() cancel their requests.
-  AddClient(WakeLockService& wake_lock);
+  // Adds a client to this WakeLock instance. Clients are grouped on a
+  // per-WakeLock instance basis: that is, a given WakeLock instance turns
+  // on its wake lock whenever *any* of its clients make a request to do so
+  // and turns off its wake lock only when *all* its clients that had
+  // previously called RequestWakelock() cancel their requests.
+  AddClient(WakeLock& wake_lock);
 
   // Test-only method that returns whether a wake lock is currently active.
   HasWakeLockForTests() => (bool result);