[ScreenOrientation] Merge mojo interface ScreenOrientationListener into ScreenOrientation

content/renderer/screen_orientation/screen_orientation_dispatcher.cc

 // Copyright 2014 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/renderer/screen_orientation/screen_orientation_dispatcher.h"
 
 #include "content/public/common/associated_interface_provider.h"
 #include "content/public/renderer/render_frame.h"
 
 namespace content {
@@ skipping 51 matching lines @@
     pending_callbacks_.Remove(iterator.GetCurrentKey());
   }
 }
 
 void ScreenOrientationDispatcher::lockOrientation(
     blink::WebScreenOrientationLockType orientation,
     std::unique_ptr<blink::WebLockOrientationCallback> callback) {
   CancelPendingLocks();
 
   int request_id = pending_callbacks_.Add(std::move(callback));
-  EnsureScreenOrientationService();
-  screen_orientation_->LockOrientation(
+  GetRemoteScreenOrientation()->LockOrientation(
       orientation,
       base::Bind(&ScreenOrientationDispatcher::OnLockOrientationResult,
                  base::Unretained(this), request_id));
 }
 
 void ScreenOrientationDispatcher::unlockOrientation() {
   CancelPendingLocks();
-  EnsureScreenOrientationService();
-  screen_orientation_->UnlockOrientation();
+  GetRemoteScreenOrientation()->UnlockOrientation();
 }
 
-void ScreenOrientationDispatcher::EnsureScreenOrientationService() {
+void ScreenOrientationDispatcher::startAccurateListen() {
+  GetRemoteScreenOrientation()->StartAccurateListen();
+}
+
+void ScreenOrientationDispatcher::stopAccurateListen() {
+  GetRemoteScreenOrientation()->StopAccurateListen();
+}
+
+device::mojom::ScreenOrientation*
+ScreenOrientationDispatcher::GetRemoteScreenOrientation() {
   if (!screen_orientation_) {
     render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
         &screen_orientation_);
   }
+
+  return screen_orientation_.get();
 }
 
 int ScreenOrientationDispatcher::GetRequestIdForTests() {
   if (pending_callbacks_.IsEmpty())
     return -1;
   CallbackMap::Iterator<blink::WebLockOrientationCallback> iterator(
       &pending_callbacks_);
   return iterator.GetCurrentKey();
 }
 
 }  // namespace content