BASELINE: Update Chromium to 56.0.2924.122

Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

3 files changed, 37 insertions, 1 deletions

diff --git a/chromium/chromecast/media/base/BUILD.gn b/chromium/chromecast/media/base/BUILD.gn
index 14c8dcc105b..8a880b60e09 100644
--- a/chromium/chromecast/media/base/BUILD.gn
+++ b/chromium/chromecast/media/base/BUILD.gn
@@ -18,7 +18,7 @@ source_set("key_systems") {
     "//base",
     "//chromecast/public/media",
     "//media",
-    "//third_party/widevine/cdm:version_h",
+    "//third_party/widevine/cdm:headers",
   ]
 }
 
@@ -38,6 +38,13 @@ source_set("base") {
     "video_plane_controller.h",
   ]
 
+  if (!is_android) {
+    sources += [
+      "video_resolution_policy.cc",
+      "video_resolution_policy.h",
+    ]
+  }
+
   public_deps = [
     ":key_systems",
     "//chromecast/public/media",
diff --git a/chromium/chromecast/media/cdm/BUILD.gn b/chromium/chromecast/media/cdm/BUILD.gn
index e6901c5c455..ed913907167 100644
--- a/chromium/chromecast/media/cdm/BUILD.gn
+++ b/chromium/chromecast/media/cdm/BUILD.gn
@@ -10,6 +10,8 @@ source_set("cdm") {
     "cast_cdm.h",
     "cast_cdm_context.cc",
     "cast_cdm_context.h",
+    "cast_cdm_factory.cc",
+    "cast_cdm_factory.h",
     "cast_cdm_proxy.cc",
     "cast_cdm_proxy.h",
     "chromecast_init_data.cc",
diff --git a/chromium/chromecast/media/service/BUILD.gn b/chromium/chromecast/media/service/BUILD.gn
new file mode 100644
index 00000000000..ad84230965a
--- /dev/null
+++ b/chromium/chromecast/media/service/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright 2015 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.
+
+source_set("service") {
+  sources = [
+    "cast_mojo_media_client.cc",
+    "cast_mojo_media_client.h",
+    "cast_renderer.cc",
+    "cast_renderer.h",
+    "media_pipeline_backend_factory.h",
+  ]
+
+  public_deps = [
+    "//media/mojo/interfaces",
+    "//media/mojo/services",
+    "//services/service_manager/public/cpp",
+  ]
+
+  deps = [
+    "//base",
+    "//chromecast/base",
+    "//chromecast/media",
+    "//media",
+    "//ui/gfx/geometry",
+  ]
+}