BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 52 insertions, 14 deletions

diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn
index 56e4598e4ba..0a7e72e321d 100644
--- a/chromium/content/common/BUILD.gn
+++ b/chromium/content/common/BUILD.gn
@@ -5,7 +5,8 @@
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/common/common.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
+import("//media/media_options.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 if (is_mac) {
   import("//build/config/mac/mac_sdk.gni")
 }
@@ -133,6 +134,13 @@ source_set("common") {
                         ".",
                         "//content")
 
+  # These files are only built in a GN build because they bring in
+  # dependencies that don't build with GYP.
+  sources += [
+    "mojo/mojo_shell_connection_impl.cc",
+    "mojo/mojo_shell_connection_impl.h",
+  ]
+
   configs += [
     "//content:content_implementation",
     "//build/config:precompiled_headers",
@@ -141,18 +149,24 @@ source_set("common") {
 
   public_deps = [
     "//gpu/command_buffer/common",
+    "//ipc",
     "//third_party/WebKit/public:blink_headers",
   ]
   deps = [
     "//base",
     "//build/util:webkit_version",
+    "//components/mus/public/interfaces",
     "//components/tracing",
     "//components/tracing:startup_tracing",
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/command_buffer/common:gles2_utils",
+    "//mojo/converters/network",
+    "//mojo/runner/child:lib",
+    "//mojo/shell/public/cpp",
     "//net",
     "//skia",
     "//third_party/icu",
+    "//third_party/libjingle",
     "//ui/accessibility",
     "//ui/base",
     "//ui/base/ime",
@@ -162,7 +176,6 @@ source_set("common") {
     "//ui/gfx/ipc",
     "//ui/shell_dialogs",
     "//url",
-    "//third_party/libjingle",
   ]
 
   if (!is_ios) {
@@ -174,6 +187,7 @@ source_set("common") {
 
       # TODO: the dependency on gl_in_process_context should be decoupled from
       # content and moved to android_webview. See crbug.com/365797.
+      ":mojo_bindings",
       "//gpu/blink",
       "//gpu/command_buffer/client:gl_in_process_context",
       "//gpu/command_buffer/client:gles2_c_lib",
@@ -183,17 +197,17 @@ source_set("common") {
       "//gpu/ipc",
       "//gpu/skia_bindings",
       "//media",
-      "//media/midi",
       "//media:shared_memory_support",
-      "//mojo/application/public/interfaces",
+      "//media/midi",
       "//mojo/common:common_base",
       "//mojo/environment:chromium",
+      "//mojo/shell/public/interfaces",
       "//sandbox",
       "//storage/common",
       "//third_party/WebKit/public:blink",
+      "//third_party/boringssl",
       "//third_party/mojo/src/mojo/edk/system",
       "//ui/gl",
-      ":mojo_bindings",
     ]
   }
 
@@ -217,17 +231,17 @@ source_set("common") {
                  "gpu/client/gpu_memory_buffer_impl_io_surface.h",
                  "gpu/gpu_memory_buffer_factory_io_surface.cc",
                  "gpu/gpu_memory_buffer_factory_io_surface.h",
-                 "gpu/media/vt.h",
-                 "gpu/media/vt_video_decode_accelerator.cc",
-                 "gpu/media/vt_video_decode_accelerator.h",
+                 "gpu/media/vt_mac.h",
+                 "gpu/media/vt_video_decode_accelerator_mac.cc",
+                 "gpu/media/vt_video_decode_accelerator_mac.h",
                ] + get_target_outputs(":libvt_generate_stubs")
 
     sources -= [ "plugin_list_posix.cc" ]
 
     deps += [
       ":libvt_generate_stubs",
-      "//content/app/resources",
       "//content:resources",
+      "//content/app/resources",
       "//third_party/WebKit/public:image_resources",
       "//third_party/WebKit/public:resources",
       "//ui/accelerated_widget_mac",
@@ -250,14 +264,14 @@ source_set("common") {
     ]
 
     deps += [
-      "//content/public/android:jni",
       "//content/public/android:common_aidl",
+      "//content/public/android:jni",
     ]
 
     libs += [ "android" ]
   }
 
-  if (is_debug && !is_component_build) {
+  if (is_debug && !is_component_build && enable_plugins) {
     # Content depends on the PPAPI message logging stuff; if this isn't here,
     # some unit test binaries won't compile. This only worked in release mode
     # because logging is disabled there.
@@ -270,6 +284,8 @@ source_set("common") {
   }
 
   if (use_ozone) {
+    configs += [ "//ui/ozone:vgem_map" ]
+
     deps += [
       "//ui/ozone:ozone",
       "//ui/ozone:ozone_base",
@@ -337,19 +353,36 @@ source_set("common") {
     sources += [
       "gpu/media/android_copying_backing_strategy.cc",
       "gpu/media/android_copying_backing_strategy.h",
+      "gpu/media/android_deferred_rendering_backing_strategy.cc",
+      "gpu/media/android_deferred_rendering_backing_strategy.h",
       "gpu/media/android_video_decode_accelerator.cc",
       "gpu/media/android_video_decode_accelerator.h",
+      "gpu/media/avda_codec_image.cc",
+      "gpu/media/avda_codec_image.h",
       "gpu/media/avda_return_on_failure.h",
+      "gpu/media/avda_shared_state.cc",
+      "gpu/media/avda_shared_state.h",
+      "gpu/media/avda_state_provider.h",
     ]
 
     if (enable_webrtc) {
       deps += [ "//third_party/libyuv" ]
+      sources += [
+        "gpu/media/android_video_encode_accelerator.cc",
+        "gpu/media/android_video_encode_accelerator.h",
+      ]
+    }
+
+    if (enable_mojo_media == "gpu") {
+      deps += [ "//media/mojo/services:application" ]
     }
   }
 
   if (is_chromeos) {
     sources += [
       "gpu/media/accelerated_video_decoder.h",
+      "gpu/media/gpu_arc_video_service.cc",
+      "gpu/media/gpu_arc_video_service.h",
       "gpu/media/h264_decoder.cc",
       "gpu/media/h264_decoder.h",
       "gpu/media/h264_dpb.cc",
@@ -363,6 +396,7 @@ source_set("common") {
       "gpu/media/vp9_picture.cc",
       "gpu/media/vp9_picture.h",
     ]
+    deps += [ "//components/arc" ]
     if (use_v4lplugin) {
       defines += [ "USE_LIBV4L2" ]
       sources += get_target_outputs(":libv4l2_generate_stubs")
@@ -370,6 +404,7 @@ source_set("common") {
     }
     if (use_v4l2_codec) {
       defines += [ "USE_V4L2_CODEC" ]
+      deps += [ "//third_party/libyuv" ]
       sources += [
         "gpu/media/generic_v4l2_device.cc",
         "gpu/media/generic_v4l2_device.h",
@@ -439,8 +474,8 @@ source_set("common") {
 
   if (is_win) {
     sources += [
-      "gpu/media/dxva_video_decode_accelerator.cc",
-      "gpu/media/dxva_video_decode_accelerator.h",
+      "gpu/media/dxva_video_decode_accelerator_win.cc",
+      "gpu/media/dxva_video_decode_accelerator_win.h",
     ]
     configs += [ "//third_party/khronos:khronos_headers" ]
     deps += [ "//ui/gl" ]
@@ -506,16 +541,19 @@ mojom("mojo_bindings") {
     "presentation/presentation_service.mojom",
     "process_control.mojom",
     "render_frame_setup.mojom",
+    "render_widget_window_tree_client_factory.mojom",
     "service_port_service.mojom",
     "service_worker/embedded_worker_setup.mojom",
     "vr_service.mojom",
+    "wake_lock_service.mojom",
   ]
 
   import_dirs = [ "//mojo/services" ]
 
   deps = [
+    "//components/mus/public/interfaces",
     "//content/public/common:mojo_bindings",
-    "//mojo/application/public/interfaces",
+    "//mojo/shell/public/interfaces",
     "//skia/public/interfaces",
     "//ui/mojo/geometry:interfaces",
   ]