Rationalize WakeLock naming conventions

content/browser/wake_lock/wake_lock_browsertest.cc

 // Copyright 2015 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 "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_timeouts.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 49 matching lines @@
   FrameTreeNode* GetNestedFrameNode() {
     FrameTreeNode* root = GetWebContentsImpl()->GetFrameTree()->root();
     CHECK_EQ(1U, root->child_count());
     return root->child_at(0);
   }
 
   RenderFrameHost* GetNestedFrame() {
     return GetNestedFrameNode()->current_frame_host();
   }
 
-  device::mojom::WakeLockService* GetRendererWakeLock() {
+  device::mojom::WakeLock* GetRendererWakeLock() {
     return GetWebContentsImpl()->GetRendererWakeLock();
   }
 
   bool HasWakeLock() {
     bool has_wakelock = false;
     base::RunLoop run_loop;
 
     GetRendererWakeLock()->HasWakeLockForTests(
         base::Bind(&OnHasWakeLock, &has_wakelock));
     run_loop.Run();
     return has_wakelock;
   }
 
   void WaitForPossibleUpdate() {
     // As Mojo channels have no common FIFO order in respect to each other and
     // to the Chromium IPC, we cannot assume that when screen.keepAwake state
-    // is changed from within a script, mojom::WakeLockService will receive an
+    // is changed from within a script, mojom::WakeLock will receive an
     // update request before ExecuteScript() returns. Therefore, some time slack
-    // is needed to make sure that mojom::WakeLockService has received any
+    // is needed to make sure that mojom::WakeLock has received any
     // possible update requests before checking the resulting wake lock state.
     base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
     RunAllPendingInMessageLoop();
   }
 
   void ScreenWakeLockInMainFrame() {
     EXPECT_TRUE(ExecuteScript(GetMainFrame(), "screen.keepAwake = true;"));
     WaitForPossibleUpdate();
     EXPECT_TRUE(HasWakeLock());
   }
@@ skipping 278 matching lines @@
       GetNestedFrame()->GetProcess(),
       RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   GetNestedFrame()->GetProcess()->Shutdown(0, false);
   watcher.Wait();
 
   // Screen wake lock should be released.
   EXPECT_FALSE(HasWakeLock());
 }
 
 }  // namespace content