[ScreenOrientation] Merge ScreenOrientation into ScreenOrientationProvider.

content/browser/web_contents/web_contents_impl.cc

 // 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.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 55 matching lines @@
 #include "content/browser/media/session/media_session_impl.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/plugin_content_origin_whitelist.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/text_input_manager.h"
-#include "content/browser/screen_orientation/screen_orientation.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_view_child_frame.h"
 #include "content/browser/web_contents/web_contents_view_guest.h"
 #include "content/browser/webui/generic_handler.h"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
 #include "content/browser/webui/web_ui_impl.h"
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/drag_messages.h"
 #include "content/common/frame_messages.h"
@@ skipping 832 matching lines @@
     const {
   if (auto widget_host = GetFullscreenRenderWidgetHost())
     return widget_host->GetView();
   return nullptr;
 }
 
 WebContentsView* WebContentsImpl::GetView() const {
   return view_.get();
 }
 
+ScreenOrientationProvider* WebContentsImpl::GetScreenOrientationProvider()
+    const {

[mlamouri (slow - plz ping), 2017/01/28 02:17:51]

curiosity (not the spaceship): is `git cl format` producing this wrapping? I
would expect something with the return type in its own line

[leonhsl(Using Gerrit), 2017/02/04 03:13:45]

Yeah this is produced by 'git cl format'. I changed to let the return type be in
one separate line but 'git cl format' will restore it again. So I think we'd
better follow 'git cl format' otherwise we may need to care about this every
time when we change here in future.

+  return screen_orientation_provider_.get();
+}
+
 SkColor WebContentsImpl::GetThemeColor() const {
   return theme_color_;
 }
 
 void WebContentsImpl::SetAccessibilityMode(AccessibilityMode mode) {
   if (mode == accessibility_mode_)
     return;
 
   // Don't allow accessibility to be enabled for WebContents that are never
   // visible, like background pages.
@@ skipping 640 matching lines @@
 
 #if BUILDFLAG(ENABLE_PLUGINS)
   plugin_content_origin_whitelist_.reset(
       new PluginContentOriginWhitelist(this));
 #endif
 
   registrar_.Add(this,
                  NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
                  NotificationService::AllBrowserContextsAndSources());
 
-  screen_orientation_.reset(new ScreenOrientation(this));
+  screen_orientation_provider_.reset(new ScreenOrientationProvider(this));
 
   manifest_manager_host_.reset(new ManifestManagerHost(this));
 
 #if defined(OS_ANDROID)
   date_time_chooser_.reset(new DateTimeChooserAndroid());
 #endif
 
   // BrowserPluginGuest::Init needs to be called after this WebContents has
   // a RenderWidgetHostViewGuest. That is, |view_->CreateView| above.
   if (browser_plugin_guest_)
@@ skipping 822 matching lines @@
 
 device::GeolocationServiceContext*
 WebContentsImpl::GetGeolocationServiceContext() {
   return geolocation_service_context_.get();
 }
 
 device::WakeLockServiceContext* WebContentsImpl::GetWakeLockServiceContext() {
   return wake_lock_service_context_.get();
 }
 
-ScreenOrientationProvider* WebContentsImpl::GetScreenOrientationProvider() {
-  return screen_orientation_.get()->GetScreenOrientationProvider();
-}
-
 void WebContentsImpl::OnShowValidationMessage(
     RenderViewHostImpl* source,
     const gfx::Rect& anchor_in_root_view,
     const base::string16& main_text,
     const base::string16& sub_text) {
   // TODO(nick): Should we consider |source| here or pass it to the delegate?
   if (delegate_)
     delegate_->ShowValidationMessage(
         this, anchor_in_root_view, main_text, sub_text);
 }
@@ skipping 2973 matching lines @@
   GetMainFrame()->AddMessageToConsole(
       content::CONSOLE_MESSAGE_LEVEL_WARNING,
       base::StringPrintf("This site does not have a valid SSL "
                          "certificate! Without SSL, your site's and "
                          "visitors' data is vulnerable to theft and "
                          "tampering. Get a valid SSL certificate before"
                          " releasing your website to the public."));
 }
 
 }  // namespace content