Rationalize WakeLock naming conventions

content/browser/renderer_host/render_widget_host_impl.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 2622 matching lines @@
   RenderProcessHost* rph = GetProcess();
   for (std::vector<IPC::Message>::const_iterator i = messages.begin();
        i != messages.end(); ++i) {
     rph->OnMessageReceived(*i);
     if (i->dispatch_error())
       rph->OnBadMessageReceived(*i);
   }
 }
 
 #if defined(OS_MACOSX)
-device::mojom::WakeLockService* RenderWidgetHostImpl::GetWakeLockService() {
+device::mojom::WakeLock* RenderWidgetHostImpl::GetWakeLockService() {
   // Here is a lazy binding, and will not reconnect after connection error.
   if (!wake_lock_) {
-    device::mojom::WakeLockServiceRequest request =
-        mojo::MakeRequest(&wake_lock_);
+    device::mojom::WakeLockRequest request = mojo::MakeRequest(&wake_lock_);
     // In some testing contexts, the service manager connection isn't
     // initialized.
     if (ServiceManagerConnection::GetForProcess()) {
       service_manager::Connector* connector =
           ServiceManagerConnection::GetForProcess()->GetConnector();
       DCHECK(connector);
       device::mojom::WakeLockProviderPtr wake_lock_provider;
       connector->BindInterface(device::mojom::kServiceName,
                                mojo::MakeRequest(&wake_lock_provider));
       wake_lock_provider->GetWakeLockWithoutContext(
           device::mojom::WakeLockType::PreventDisplaySleep,
           device::mojom::WakeLockReason::ReasonOther, "GetSnapshot",
           std::move(request));
     }
   }
   return wake_lock_.get();
 }
 #endif
 
 }  // namespace content