[ScreenOrientation] Merge ScreenOrientation into ScreenOrientationProvider.

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index bbbe490bb2d7968636487c5a08688b233a327bb7..4ece254c6d035529a25871133e49fcaa9dbe8342 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -72,7 +72,6 @@ class RenderViewHostDelegateView;
 class RenderWidgetHostImpl;
 class RenderWidgetHostInputEventRouter;
 class SavePackage;
-class ScreenOrientation;
 class ScreenOrientationProvider;
 class SiteInstance;
 class TestWebContents;
@@ -210,6 +209,8 @@ class CONTENT_EXPORT WebContentsImpl
 
   WebContentsView* GetView() const;
 
+  ScreenOrientationProvider* GetScreenOrientationProvider() const;
+
   bool should_normally_be_visible() { return should_normally_be_visible_; }
 
   // Indicate if the window has been occluded, and pass this to the views, only
@@ -478,7 +479,6 @@ class CONTENT_EXPORT WebContentsImpl
       int browser_plugin_instance_id) override;
   device::GeolocationServiceContext* GetGeolocationServiceContext() override;
   device::WakeLockServiceContext* GetWakeLockServiceContext() override;
-  ScreenOrientationProvider* GetScreenOrientationProvider() override;
   void EnterFullscreenMode(const GURL& origin) override;
   void ExitFullscreenMode(bool will_cause_resize) override;
   bool ShouldRouteMessageEvent(
@@ -1438,7 +1438,7 @@ class CONTENT_EXPORT WebContentsImpl
 
   std::unique_ptr<device::WakeLockServiceContext> wake_lock_service_context_;
 
-  std::unique_ptr<ScreenOrientation> screen_orientation_;
+  std::unique_ptr<ScreenOrientationProvider> screen_orientation_provider_;
 
   std::unique_ptr<ManifestManagerHost> manifest_manager_host_;