[ScreenOrientation] Merge ScreenOrientation into ScreenOrientationProvider.

content/browser/BUILD.gn

Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 1733495c9629b1e7e1bf05db634807b7297bd99b..7b42351a21c795efe5594dd858f095b16534dec7 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -76,7 +76,6 @@ source_set("browser") {
     "//device/geolocation/public/interfaces",
     "//device/nfc:mojo_bindings",
     "//device/power_save_blocker",
-    "//device/screen_orientation/public/interfaces",
     "//device/sensors",
     "//device/vibration",
     "//device/vr",
@@ -1207,8 +1206,6 @@ source_set("browser") {
     "resolve_proxy_msg_helper.h",
     "resource_context_impl.cc",
     "resource_context_impl.h",
-    "screen_orientation/screen_orientation.cc",
-    "screen_orientation/screen_orientation.h",
     "screen_orientation/screen_orientation_delegate_win.cc",
     "screen_orientation/screen_orientation_delegate_win.h",
     "service_manager/merge_dictionary.cc",
@@ -1800,6 +1797,7 @@ source_set("browser") {
     deps -= [ "//device/battery" ]
     deps += [
       "//content/public/android:jni",
+      "//device/screen_orientation/public/interfaces",
       "//media",
       "//media/capture/content/android",
       "//media/capture/video/android",