[ScreenOrientation] Merge mojo interface ScreenOrientationListener into ScreenOrientation

content/renderer/screen_orientation/screen_orientation_dispatcher.h

 // 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.
 
 #ifndef CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_
 #define CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_
 
 #include <memory>
 #include <utility>
 
@@ skipping 29 matching lines @@
   friend class ScreenOrientationDispatcherTest;
 
   // RenderFrameObserver implementation.
   void OnDestruct() override;
 
   // blink::WebScreenOrientationClient implementation.
   void lockOrientation(
       blink::WebScreenOrientationLockType orientation,
       std::unique_ptr<blink::WebLockOrientationCallback> callback) override;
   void unlockOrientation() override;
+  void startAccurateListen() override;
+  void stopAccurateListen() override;
 
   void OnLockOrientationResult(int request_id,
                                ScreenOrientationLockResult result);
 
   void CancelPendingLocks();
 
   int GetRequestIdForTests();
 
-  void EnsureScreenOrientationService();
+  device::mojom::ScreenOrientation* GetRemoteScreenOrientation();
 
   // This should only be called by ScreenOrientationDispatcherTest
   void SetScreenOrientationForTests(
       ScreenOrientationAssociatedPtr& screen_orientation_for_tests) {
     screen_orientation_ = std::move(screen_orientation_for_tests);
   }
 
   // The pending_callbacks_ map is mostly meant to have a unique ID to associate
   // with every callback going trough the dispatcher. The map will own the
   // pointer in the sense that it will destroy it when Remove() will be called.
   // Furthermore, we only expect to have one callback at a time in this map,
   // which is what IDMap was designed for.
   using CallbackMap = IDMap<std::unique_ptr<blink::WebLockOrientationCallback>>;
   CallbackMap pending_callbacks_;
 
   ScreenOrientationAssociatedPtr screen_orientation_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DISPATCHER_H_