Rationalize WakeLock naming conventions

content/browser/renderer_host/render_widget_host_impl.h

 // Copyright (c) 2012 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_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 38 matching lines @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "third_party/WebKit/public/platform/WebDisplayMode.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/latency/latency_info.h"
 
 #if defined(OS_MACOSX)
-#include "device/wake_lock/public/interfaces/wake_lock_service.mojom.h"
+#include "device/wake_lock/public/interfaces/wake_lock.mojom.h"
 #endif
 
 class SkBitmap;
 struct FrameHostMsg_HittestData_Params;
 struct ViewHostMsg_SelectionBounds_Params;
 struct ViewHostMsg_UpdateRect_Params;
 
 namespace blink {
 class WebInputEvent;
 class WebMouseEvent;
@@ skipping 686 matching lines @@
   void StopHangMonitorTimeout();
 
   // Used for UMA logging how long the renderer was unresponsive.
   void LogHangMonitorUnresponsive();
 
   // Once both the frame and its swap messages arrive, we call this method to
   // process the messages. Virtual for tests.
   virtual void ProcessSwapMessages(std::vector<IPC::Message> messages);
 
 #if defined(OS_MACOSX)
-  device::mojom::WakeLockService* GetWakeLockService();
+  device::mojom::WakeLock* GetWakeLock();
 #endif
 
   // true if a renderer has once been valid. We use this flag to display a sad
   // tab only when we lose our renderer and not if a paint occurs during
   // initialization.
   bool renderer_initialized_;
 
   // True if |Destroy()| has been called.
   bool destroyed_;
 
@@ skipping 179 matching lines @@
   bool monitoring_composition_info_;
 
   // This is the content_source_id of the latest frame received. This value is
   // compared against current_content_source_id_ to determine whether the
   // received frame belongs to the current page. If a frame for the current page
   // does not arrive in time after nagivation, we clear the graphics of the old
   // page. See RenderWidget::current_content_source_id_ for more information.
   uint32_t last_received_content_source_id_ = 0;
 
 #if defined(OS_MACOSX)
-  device::mojom::WakeLockServicePtr wake_lock_;
+  device::mojom::WakeLockPtr wake_lock_;
 #endif
 
   // These information are used to verify that the renderer does not misbehave
   // when it comes to allocating LocalSurfaceIds. If surface properties change,
   // a new LocalSurfaceId must be created.
   cc::LocalSurfaceId last_local_surface_id_;
   RenderWidgetSurfaceProperties last_surface_properties_;
 
   mojo::Binding<cc::mojom::MojoCompositorFrameSink>
       compositor_frame_sink_binding_;
@@ skipping 12 matching lines @@
   base::OnceClosure begin_frame_callback_;
 
   base::WeakPtrFactory<RenderWidgetHostImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_