Rationalize WakeLock naming conventions

device/wake_lock/wake_lock_for_testing.h

Index: device/wake_lock/wake_lock_for_testing.h
diff --git a/device/wake_lock/wake_lock_service_impl_for_testing.h b/device/wake_lock/wake_lock_for_testing.h
similarity index 58%
rename from device/wake_lock/wake_lock_service_impl_for_testing.h
rename to device/wake_lock/wake_lock_for_testing.h
index 23409d3593a2c9307497f3d95350405f27029e3d..0242ae42e2ddf9ead5edc9bc75e4bde041f8ba74 100644
--- a/device/wake_lock/wake_lock_service_impl_for_testing.h
+++ b/device/wake_lock/wake_lock_for_testing.h
@@ -1,34 +1,34 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2017 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 SERVICES_DEVICE_WAKE_LOCK_WAKE_LOCK_SERVICE_IMPL_FOR_TESTING_H_
-#define SERVICES_DEVICE_WAKE_LOCK_WAKE_LOCK_SERVICE_IMPL_FOR_TESTING_H_
+#ifndef SERVICES_DEVICE_WAKE_LOCK_WAKE_LOCK_FOR_TESTING_H_
+#define SERVICES_DEVICE_WAKE_LOCK_WAKE_LOCK_FOR_TESTING_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
+#include "device/wake_lock/public/interfaces/wake_lock.mojom.h"
 #include "device/wake_lock/public/interfaces/wake_lock_context.mojom.h"
-#include "device/wake_lock/public/interfaces/wake_lock_service.mojom.h"
-#include "device/wake_lock/wake_lock_service_impl.h"
+#include "device/wake_lock/wake_lock.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace device {
 
-class WakeLockServiceImplForTesting : public WakeLockServiceImpl {
+class WakeLockForTesting : public WakeLock {
  public:
-  WakeLockServiceImplForTesting(
-      mojom::WakeLockServiceRequest request,
+  WakeLockForTesting(
+      mojom::WakeLockRequest request,
       mojom::WakeLockType type,
       mojom::WakeLockReason reason,
       const std::string& description,
       int context_id,
       WakeLockContextCallback native_view_getter,
       scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
-  ~WakeLockServiceImplForTesting() override;
+  ~WakeLockForTesting() override;
 
   void HasWakeLockForTests(HasWakeLockForTestsCallback callback) override;
 
@@ -39,9 +39,9 @@ class WakeLockServiceImplForTesting : public WakeLockServiceImpl {
 
   bool has_wake_lock_;
 
-  DISALLOW_COPY_AND_ASSIGN(WakeLockServiceImplForTesting);
+  DISALLOW_COPY_AND_ASSIGN(WakeLockForTesting);
 };
 
 }  // namespace device
 
-#endif  // SERVICES_DEVICE_WAKE_LOCK_WAKE_LOCK_SERVICE_IMPL_FOR_TESTING_H_
+#endif  // SERVICES_DEVICE_WAKE_LOCK_WAKE_LOCK_FOR_TESTING_H_