Rationalize WakeLock naming conventions

content/browser/webrtc/webrtc_internals.cc

 // Copyright (c) 2013 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/webrtc/webrtc_internals.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 531 matching lines @@
 
 void WebRTCInternals::UpdateWakeLock() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!should_block_power_saving_)
     return;
 
   if (num_open_connections_ == 0) {
     DVLOG(1)
         << ("Cancel the wake lock on application suspension since no "
             "PeerConnections are active anymore.");
-    GetWakeLockService()->CancelWakeLock();
+    GetWakeLock()->CancelWakeLock();
   } else if (num_open_connections_ != 0) {
     DVLOG(1) << ("Preventing the application from being suspended while one or "
                  "more PeerConnections are active.");
-    GetWakeLockService()->RequestWakeLock();
+    GetWakeLock()->RequestWakeLock();
   }
 }
 
-device::mojom::WakeLockService* WebRTCInternals::GetWakeLockService() {
+device::mojom::WakeLock* WebRTCInternals::GetWakeLock() {
   // Here is a lazy binding, and will not reconnect after connection error.
-  if (!wake_lock_service_) {
-    device::mojom::WakeLockServiceRequest request =
-        mojo::MakeRequest(&wake_lock_service_);
+  if (!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::PreventAppSuspension,
           device::mojom::WakeLockReason::ReasonOther,
           "WebRTC has active PeerConnections", std::move(request));
     }
   }
-  return wake_lock_service_.get();
+  return wake_lock_.get();
 }
 
 void WebRTCInternals::ProcessPendingUpdates() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   while (!pending_updates_.empty()) {
     const auto& update = pending_updates_.front();
     for (auto& observer : observers_)
       observer.OnUpdate(update.command(), update.value());
     pending_updates_.pop();
   }
@@ skipping 15 matching lines @@
 
     if (this_pid == static_cast<int>(pid) && this_lid == lid) {
       if (index)
         *index = i;
       return record;
     }
   }
   return nullptr;
 }
 }  // namespace content