Rationalize WakeLock naming conventions

content/browser/webrtc/webrtc_internals_unittest.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 <memory>
 #include <string>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 27 matching lines @@
     value_.reset(value ? value->DeepCopy() : nullptr);
     if (loop_)
       loop_->Quit();
   }
 
   std::string command_;
   std::unique_ptr<base::Value> value_;
   base::RunLoop* loop_;
 };
 
-class MockWakeLockService : public device::mojom::WakeLockService {
+class MockWakeLock : public device::mojom::WakeLock {
  public:
-  MockWakeLockService(device::mojom::WakeLockServiceRequest request)
+  MockWakeLock(device::mojom::WakeLockRequest request)
       : binding_(this, std::move(request)), has_wakelock_(false) {}
-  ~MockWakeLockService() override {}
+  ~MockWakeLock() override {}
 
-  // Implement device::mojom::WakeLockService:
+  // Implement device::mojom::WakeLock:
   void RequestWakeLock() override { has_wakelock_ = true; }
   void CancelWakeLock() override { has_wakelock_ = false; }
-  void AddClient(device::mojom::WakeLockServiceRequest request) override {}
+  void AddClient(device::mojom::WakeLockRequest request) override {}
   void HasWakeLockForTests(HasWakeLockForTestsCallback callback) override {}
 
   bool HasWakeLock() {
     base::RunLoop().RunUntilIdle();
     return has_wakelock_;
   }
 
  private:
-  mojo::Binding<device::mojom::WakeLockService> binding_;
+  mojo::Binding<device::mojom::WakeLock> binding_;
   bool has_wakelock_;
 };
 
 // Derived class for testing only.  Allows the tests to have their own instance
 // for testing and control the period for which WebRTCInternals will bulk up
 // updates (changes down from 500ms to 1ms).
 class WebRTCInternalsForTest : public NON_EXPORTED_BASE(WebRTCInternals) {
  public:
   WebRTCInternalsForTest()
       : WebRTCInternals(1, true),
-        mock_wake_lock_service_(mojo::MakeRequest(&wake_lock_service_)) {}
+        mock_wake_lock_(mojo::MakeRequest(&wake_lock_)) {}
   ~WebRTCInternalsForTest() override {}
-  bool HasWakeLock() { return mock_wake_lock_service_.HasWakeLock(); }
+  bool HasWakeLock() { return mock_wake_lock_.HasWakeLock(); }
 
  private:
-  MockWakeLockService mock_wake_lock_service_;
+  MockWakeLock mock_wake_lock_;
 };
 
 }  // namespace
 
 class WebRtcInternalsTest : public testing::Test {
  public:
   WebRtcInternalsTest() : io_thread_(BrowserThread::UI, &io_loop_) {}
 
  protected:
   void VerifyString(const base::DictionaryValue* dict,
@@ skipping 374 matching lines @@
   webrtc_internals.OnRemovePeerConnection(pid, lid[1]);
   EXPECT_EQ(0, webrtc_internals.num_open_connections());
   EXPECT_FALSE(webrtc_internals.HasWakeLock());
 
   webrtc_internals.OnRemovePeerConnection(pid, lid[0]);
   EXPECT_EQ(0, webrtc_internals.num_open_connections());
   EXPECT_FALSE(webrtc_internals.HasWakeLock());
 }
 
 }  // namespace content