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 539 matching lines @@
         << ("Cancel the wake lock on application suspension since no "
             "PeerConnections are active anymore.");
     GetWakeLockService()->CancelWakeLock();
   } else if (num_open_connections_ != 0) {
     DVLOG(1) << ("Preventing the application from being suspended while one or "
                  "more PeerConnections are active.");
     GetWakeLockService()->RequestWakeLock();
   }
 }
 
-device::mojom::WakeLockService* WebRTCInternals::GetWakeLockService() {
+device::mojom::WakeLock* WebRTCInternals::GetWakeLockService() {

[blundell, 2017/06/05 11:48:11]

same

[juncai, 2017/06/05 18:58:25]

Done.

   // Here is a lazy binding, and will not reconnect after connection error.
   if (!wake_lock_service_) {
-    device::mojom::WakeLockServiceRequest request =
+    device::mojom::WakeLockRequest request =
         mojo::MakeRequest(&wake_lock_service_);
     // 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));
@@ skipping 32 matching lines @@
 
     if (this_pid == static_cast<int>(pid) && this_lid == lid) {
       if (index)
         *index = i;
       return record;
     }
   }
   return nullptr;
 }
 }  // namespace content