Rationalize WakeLock naming conventions

content/browser/webrtc/webrtc_internals.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEBRTC_WEBRTC_INTERNALS_H_
 #define CONTENT_BROWSER_WEBRTC_WEBRTC_INTERNALS_H_
 
 #include <memory>
 #include <queue>
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/process/process.h"
 #include "base/threading/thread_checker.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/render_process_host_observer.h"
-#include "device/wake_lock/public/interfaces/wake_lock_service.mojom.h"
+#include "device/wake_lock/public/interfaces/wake_lock.mojom.h"
 #include "media/media_features.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 namespace content {
 
 class WebContents;
 class WebRTCInternalsUIObserver;
 
 // This is a singleton class running in the browser UI thread.
 // It collects peer connection infomation from the renderers,
@@ skipping 78 matching lines @@
 
  protected:
   // Constructor/Destructor are protected to allow tests to derive from the
   // class and do per-instance testing without having to use the global
   // instance.
   // The default ctor sets |aggregate_updates_ms| to 500ms.
   WebRTCInternals();
   WebRTCInternals(int aggregate_updates_ms, bool should_block_power_saving);
   ~WebRTCInternals() override;
 
-  device::mojom::WakeLockServicePtr wake_lock_service_;
+  device::mojom::WakeLockPtr wake_lock_service_;
 
  private:
   friend struct base::LazyInstanceTraitsBase<WebRTCInternals>;
   FRIEND_TEST_ALL_PREFIXES(WebRtcAudioDebugRecordingsBrowserTest,
                            CallWithAudioDebugRecordings);
   FRIEND_TEST_ALL_PREFIXES(WebRtcAudioDebugRecordingsBrowserTest,
                            CallWithAudioDebugRecordingsEnabledThenDisabled);
   FRIEND_TEST_ALL_PREFIXES(WebRtcAudioDebugRecordingsBrowserTest,
                            TwoCallsWithAudioDebugRecordings);
   FRIEND_TEST_ALL_PREFIXES(WebRtcInternalsTest,
@@ skipping 28 matching lines @@
 
   // Updates the number of open PeerConnections. Called when a PeerConnection
   // is stopped or removed.
   void MaybeClosePeerConnection(base::DictionaryValue* record);
 
   // Called whenever a PeerConnection is created or stopped in order to
   // request/cancel a wake lock on suspending the current application for power
   // saving.
   void UpdateWakeLock();
 
-  device::mojom::WakeLockService* GetWakeLockService();
+  device::mojom::WakeLock* GetWakeLockService();

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

nit: GetWakeLock()

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

Done.

 
   // Called on a timer to deliver updates to javascript.
   // We throttle and bulk together updates to avoid DOS like scenarios where
   // a page uses a lot of peerconnection instances with many event
   // notifications.
   void ProcessPendingUpdates();
 
   base::DictionaryValue* FindRecord(base::ProcessId pid,
                                     int lid,
                                     size_t* index = nullptr);
@@ skipping 73 matching lines @@
   std::queue<PendingUpdate> pending_updates_;
   const int aggregate_updates_ms_;
 
   // Weak factory for this object that we use for bulking up updates.
   base::WeakPtrFactory<WebRTCInternals> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEBRTC_WEBRTC_INTERNALS_H_