[ScreenOrientation] Merge mojo interface ScreenOrientationListener into ScreenOrientation

content/browser/screen_orientation/screen_orientation_provider.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_BROWSER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_PROVIDER_H_
 #define CONTENT_BROWSER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_PROVIDER_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 17 matching lines @@
       public WebContentsObserver {
  public:
   ScreenOrientationProvider(WebContents* web_contents);
 
   ~ScreenOrientationProvider() override;
 
   // device::mojom::ScreenOrientation:
   void LockOrientation(blink::WebScreenOrientationLockType orientation,
                        const LockOrientationCallback& callback) override;
   void UnlockOrientation() override;
+  void StartAccurateListen() override;
+  void StopAccurateListen() override;
 
   // Inform about a screen orientation update. It is called to let the provider
   // know if a lock has been resolved.
   void OnOrientationChange();
 
   // Provide a delegate which creates delegates for platform implementations.
   // The delegate is not owned by ScreenOrientationProvider.
   static void SetDelegate(ScreenOrientationDelegate* delegate_);
 
   // WebContentsObserver
@@ skipping 11 matching lines @@
   // found.
   blink::WebScreenOrientationLockType GetNaturalLockType() const;
 
   // Whether the passed |lock| matches the current orientation. In other words,
   // whether the orientation will need to change to match the |lock|.
   bool LockMatchesCurrentOrientation(blink::WebScreenOrientationLockType lock);
 
   // Not owned, responsible for platform implementations.
   static ScreenOrientationDelegate* delegate_;
 
+#if defined(OS_ANDROID)
+  int accurate_listen_count_ = 0;

[mlamouri (slow - plz ping), 2017/02/15 10:58:41]

nit: `accurate_listener_count_`? feel free to ignore

[leonhsl(Using Gerrit), 2017/02/16 05:00:05]

Done.

+#endif
+
   // Whether the ScreenOrientationProvider currently has a lock applied.
   bool lock_applied_;
 
   // Lock that require orientation changes are not completed until
   // OnOrientationChange.
   base::Optional<blink::WebScreenOrientationLockType> pending_lock_orientation_;
 
   LockOrientationCallback pending_callback_;
 
   WebContentsFrameBindingSet<device::mojom::ScreenOrientation> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenOrientationProvider);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_PROVIDER_H_