BASELINE: Update Chromium to 56.0.2924.122

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

12 files changed, 181 insertions, 134 deletions

diff --git a/chromium/chromecast/BUILD.gn b/chromium/chromecast/BUILD.gn
index 43030f0478f..9a454506d96 100644
--- a/chromium/chromecast/BUILD.gn
+++ b/chromium/chromecast/BUILD.gn
@@ -42,6 +42,7 @@ cast_test_group("cast_tests") {
     "//ppapi:ppapi_unittests",
     "//sandbox/linux:sandbox_linux_unittests",
     "//sql:sql_unittests",
+    "//storage/browser:storage_unittests",
     "//third_party/cacheinvalidation:cacheinvalidation_unittests",
     "//ui/base:ui_base_unittests",
   ]
@@ -60,8 +61,8 @@ cast_test_group("cast_tests") {
 
   if (!is_android) {
     tests += [
-      "//chromecast/app:cast_shell_unittests",
-      "//chromecast/browser:cast_shell_browser_test",
+      ":cast_shell_browsertests",
+      ":cast_shell_unittests",
       "//chromecast/media:cast_media_unittests",
       "//ipc:ipc_tests",
       "//jingle:jingle_unittests",
@@ -76,8 +77,8 @@ cast_test_group("cast_tests") {
     }
     filters += [ cast_media_unittests_filter ]
 
-    cast_shell_browser_test_filter = {
-      test_name = "cast_shell_browser_test"
+    cast_shell_browsertests_filter = {
+      test_name = "cast_shell_browsertests"
 
       # --enable-local-file-accesses => to load sample media files
       # --test-launcher-jobs=1 => so internal code can bind to port
@@ -92,7 +93,7 @@ cast_test_group("cast_tests") {
         args += [ "--use-gpu-in-tests" ]
       }
     }
-    filters += [ cast_shell_browser_test_filter ]
+    filters += [ cast_shell_browsertests_filter ]
 
     ipc_tests_filter = {
       test_name = "ipc_tests"
@@ -196,7 +197,13 @@ cast_test_group("cast_tests") {
 
   net_unittests_filter = {
     test_name = "net_unittests"
-    if (target_os == "linux" && !is_cast_desktop_build) {
+    if (using_sanitizer) {
+      # TODO(mbjorge): net_unittests do not complete when run with sanitizers,
+      # (in particular, TSAN and UBSAN), resulting in build machines getting stuck
+      # for many hours. Disable them for now, since these are getting run on
+      # Chromium bots anyway. (internal b/31279943)
+      gtest_excludes = [ "*" ]
+    } else if (target_os == "linux" && !is_cast_desktop_build) {
       # Run net_unittests first to avoid random failures due to slow python startup
       # KeygenHandlerTest.SmokeTest and KeygenHandlerTest.ConcurrencyTest fail due to
       # readonly certdb (b/8153161)
@@ -229,15 +236,6 @@ cast_test_group("cast_tests") {
     }
   }
   filters += [ net_unittests_filter ]
-
-  # TODO(mbjorge): net_unittests do not complete when run with sanitizers,
-  # (in particular, TSAN and UBSAN), resulting in build machines getting stuck
-  # for many hours. Disable them for now, since these are getting run on
-  # Chromium bots anyway. (internal b/31279943)
-  if (using_sanitizer) {
-    tests -= [ "//net:net_unittests" ]
-    filters -= [ net_unittests_filter ]
-  }
 }
 
 # Creates the build and run lists for all test targets.
@@ -278,24 +276,44 @@ if (is_android) {
   }
 }
 
-source_set("cast_shell_common") {
+test("cast_shell_unittests") {
+  deps = [
+    ":cast_shell_lib",
+    "//chromecast/app:test_support",
+    "//chromecast/app:unittests",
+    "//chromecast/browser:unittests",
+  ]
+}
+
+test("cast_shell_browsertests") {
   deps = [
+    ":cast_shell_lib",
+    "//chromecast/app:test_support",
+    "//chromecast/browser:browsertests",
+  ]
+
+  if (chromecast_branding == "public") {
+    # Link default libcast_media_1.0 statically not to link dummy one
+    # dynamically for public unittests.
+    deps += [ "//chromecast/media/base:libcast_media_1.0_default_core" ]
+  }
+}
+
+group("cast_shell_lib") {
+  data_deps = [
     ":cast_shell_pak",
-    ":chromecast_locales_pak",
+  ]
+
+  deps = [
     "//chromecast/app",
     "//chromecast/browser",
     "//chromecast/common",
-    "//chromecast/common/media",
     "//chromecast/renderer",
   ]
-}
 
-source_set("cast_shell_media") {
-  deps = [
-    "//chromecast/browser/media",
-    "//chromecast/common/media",
-    "//chromecast/renderer/media",
-  ]
+  if (chromecast_branding != "public") {
+    deps += [ "//chromecast/internal/shell" ]
+  }
 }
 
 executable("cast_shell") {
@@ -304,16 +322,12 @@ executable("cast_shell") {
   ]
 
   deps = [
-    ":cast_shell_common",
-    ":cast_shell_media",
+    ":cast_shell_lib",
+    ":chromecast_locales_pak",
     "//build/config/sanitizers:deps",
     "//chromecast/app",
     "//content/public/app:both",
   ]
-
-  if (chromecast_branding != "public") {
-    deps += [ "//chromecast/internal:cast_shell_internal" ]
-  }
 }
 
 repack("cast_shell_pak") {
diff --git a/chromium/chromecast/android/BUILD.gn b/chromium/chromecast/android/BUILD.gn
index eca15870814..464f37acedf 100644
--- a/chromium/chromecast/android/BUILD.gn
+++ b/chromium/chromecast/android/BUILD.gn
@@ -28,7 +28,7 @@ shared_library("libcast_shell_android") {
   deps = [
     ":platform_jni_loader",
     "//base",
-    "//chromecast:cast_shell_common",
+    "//chromecast:cast_shell_lib",
     "//chromecast/app",
     "//chromecast/app:cast_crash_client",
     "//chromecast/base",
@@ -42,9 +42,7 @@ shared_library("libcast_shell_android") {
     "//skia",
   ]
 
-  if (chromecast_branding != "public") {
-    deps += [ "//chromecast/internal:cast_shell_android_internal" ]
-  } else {
+  if (chromecast_branding == "public") {
     sources += [ "platform_jni_loader_stub.cc" ]
   }
 }
diff --git a/chromium/chromecast/app/BUILD.gn b/chromium/chromecast/app/BUILD.gn
index ffc10702936..7f0f44fb933 100644
--- a/chromium/chromecast/app/BUILD.gn
+++ b/chromium/chromecast/app/BUILD.gn
@@ -56,8 +56,23 @@ source_set("cast_crash_client") {
   }
 }
 
-# TODO(kmackay) Consider renaming this.
-test("cast_shell_unittests") {
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "cast_test_launcher.cc",
+  ]
+
+  deps = [
+    ":app",
+    "//base",
+    "//base/test:test_support",
+    "//chromecast/base",
+    "//content/test:test_support",
+  ]
+}
+
+source_set("unittests") {
+  testonly = true
   sources = [
     "linux/cast_crash_reporter_client_unittest.cc",
   ]
@@ -65,7 +80,6 @@ test("cast_shell_unittests") {
   deps = [
     ":cast_crash_client",
     "//base",
-    "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//chromecast/base:test_support",
     "//chromecast/crash",
diff --git a/chromium/chromecast/browser/BUILD.gn b/chromium/chromecast/browser/BUILD.gn
index 1612181de57..9937c5447fd 100644
--- a/chromium/chromecast/browser/BUILD.gn
+++ b/chromium/chromecast/browser/BUILD.gn
@@ -43,12 +43,14 @@ source_set("browser") {
     "cast_quota_permission_context.h",
     "cast_resource_dispatcher_host_delegate.cc",
     "cast_resource_dispatcher_host_delegate.h",
-    "devtools/cast_devtools_delegate.cc",
-    "devtools/cast_devtools_delegate.h",
+    "devtools/cast_devtools_manager_delegate.cc",
+    "devtools/cast_devtools_manager_delegate.h",
     "devtools/remote_debugging_server.cc",
     "devtools/remote_debugging_server.h",
     "geolocation/cast_access_token_store.cc",
     "geolocation/cast_access_token_store.h",
+    "media/media_caps_impl.cc",
+    "media/media_caps_impl.h",
     "metrics/cast_metrics_prefs.cc",
     "metrics/cast_metrics_prefs.h",
     "metrics/cast_metrics_service_client.cc",
@@ -71,10 +73,6 @@ source_set("browser") {
     ]
   }
 
-  public_deps = [
-    "//chromecast/browser/media",
-  ]
-
   deps = [
     "//base",
     "//base:i18n",
@@ -89,8 +87,10 @@ source_set("browser") {
     "//chromecast/browser:resources",
     "//chromecast/common",
     "//chromecast/common/media",
+    "//chromecast/common/media:interfaces",
     "//chromecast/graphics",
     "//chromecast/media",
+    "//chromecast/media/service",
     "//chromecast/net",
     "//chromecast/service",
     "//components/crash/content/app",
@@ -158,27 +158,18 @@ grit("resources") {
 
 source_set("test_support") {
   testonly = true
-
   sources = [
-    "test/chromecast_browser_test.cc",
-    "test/chromecast_browser_test.h",
-    "test/chromecast_browser_test_helper.h",
-    "test/chromecast_browser_test_runner.cc",
+    "test/cast_browser_test.cc",
+    "test/cast_browser_test.h",
   ]
 
-  if (chromecast_branding == "public") {
-    sources += [ "test/chromecast_browser_test_helper_default.cc" ]
-  }
-
   public_deps = [
     ":browser",
-    "//chromecast:cast_shell_common",
     "//content/test:test_support",
   ]
 
   deps = [
     "//base",
-    "//chromecast/app",
     "//chromecast/base",
     "//content/public/browser",
     "//content/public/common",
@@ -186,39 +177,37 @@ source_set("test_support") {
   ]
 }
 
-config("browser_test_config") {
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-}
-
-test("cast_shell_browser_test") {
+source_set("browsertests") {
+  testonly = true
   sources = [
-    "test/chromecast_shell_browser_test.cc",
-    "test/chromecast_shell_media_blocking_browser_test.cc",
+    "cast_media_blocker_browsertest.cc",
+    "test/cast_navigation_browsertest.cc",
   ]
 
-  configs += [ ":browser_test_config" ]
+  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   deps = [
     ":test_support",
-    "//base",
     "//chromecast:chromecast_features",
-    "//content/test:test_support",
     "//media/base:test_support",
-    "//testing/gtest",
-    "//url",
   ]
+}
 
-  # TODO(slan): Find a better way to do this.
-  if (chromecast_branding != "public") {
-    deps += [ "//chromecast/internal:cast_shell_internal" ]
-    deps += [ "//chromecast/internal/shell:cast_shell_browser_test_helper_internal" ]
-  }
+source_set("unittests") {
+  testonly = true
 
-  if (chromecast_branding == "public") {
-    # Link default libcast_media_1.0 statically not to link dummy one
-    # dynamically for public unittests.
-    deps += [ "//chromecast/media/base:libcast_media_1.0_default_core" ]
-  }
+  sources = [
+    "cast_media_blocker_unittest.cc",
+    "devtools/cast_devtools_manager_delegate_unittest.cc",
+  ]
+
+  deps = [
+    ":browser",
+    "//base",
+    "//chromecast/base",
+    "//content/public/browser",
+    "//content/test:test_support",
+  ]
 }
 
 if (is_android) {
diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn
index 358c11f960c..4b69a941ef7 100644
--- a/chromium/chromecast/browser/android/BUILD.gn
+++ b/chromium/chromecast/browser/android/BUILD.gn
@@ -6,13 +6,16 @@ import("//build/config/android/rules.gni")
 
 assert(is_android)
 
+cast_shell_android_manifest =
+    "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml"
+
 jinja_template("cast_shell_manifest") {
   input = "apk/AndroidManifest.xml.jinja2"
-  output = "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml"
+  output = cast_shell_android_manifest
 }
 
 android_resources("cast_shell_android_resources") {
-  android_manifest = "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml"
+  android_manifest = cast_shell_android_manifest
   android_manifest_dep = ":cast_shell_manifest"
   resource_dirs = [ "//chromecast/browser/android/apk/res" ]
 }
@@ -32,8 +35,11 @@ android_library("cast_shell_java") {
     "$java_src_dir/org/chromium/chromecast/shell/CastWindowManager.java",
   ]
 
+  android_manifest = cast_shell_android_manifest
+
   deps = [
     ":cast_shell_android_resources",
+    ":cast_shell_manifest",
     "//base:base_java",
     "//chromecast/base:base_java",
     "//content/public/android:content_java",
diff --git a/chromium/chromecast/browser/media/BUILD.gn b/chromium/chromecast/browser/media/BUILD.gn
deleted file mode 100644
index 433a81899e6..00000000000
--- a/chromium/chromecast/browser/media/BUILD.gn
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.
-
-import("//media/media_options.gni")
-
-source_set("media") {
-  sources = [
-    "cast_browser_cdm_factory.cc",
-    "cast_browser_cdm_factory.h",
-    "media_caps_impl.cc",
-    "media_caps_impl.h",
-    "media_pipeline_backend_factory.h",
-  ]
-
-  if (mojo_media_host == "browser") {
-    sources += [
-      "cast_mojo_media_client.cc",
-      "cast_mojo_media_client.h",
-      "cast_renderer.cc",
-      "cast_renderer.h",
-    ]
-  }
-
-  if (mojo_media_host == "browser") {
-    public_deps = [
-      "//media/mojo/interfaces",
-      "//media/mojo/services",
-      "//services/shell/public/cpp",
-    ]
-  }
-
-  deps = [
-    "//base",
-    "//chromecast/base",
-    "//chromecast/common/media",
-    "//chromecast/common/media:interfaces",
-    "//chromecast/media",
-    "//content/public/browser",
-    "//media",
-    "//ui/gfx/geometry",
-  ]
-
-  if (!is_android) {
-    sources += [
-      "video_resolution_policy.cc",
-      "video_resolution_policy.h",
-    ]
-  }
-}
diff --git a/chromium/chromecast/common/media/media_caps.mojom b/chromium/chromecast/common/media/media_caps.mojom
index ad76f9b6163..4baa0303ba6 100644
--- a/chromium/chromecast/common/media/media_caps.mojom
+++ b/chromium/chromecast/common/media/media_caps.mojom
@@ -9,9 +9,13 @@ interface MediaCaps {
 };
 
 interface MediaCapsObserver {
-  // Bitmask values defined in enum HdmiSinkCodec
+  // Bitmask values defined in enum HdmiSinkCodec (avsettings.h)
   SupportedHdmiSinkCodecsChanged(uint32 supported_codec_bitmask);
   ScreenResolutionChanged(uint32 width, uint32 height);
+
+  // EOTFs and Dolby Vision flags defined in avsettings.h
   ScreenInfoChanged(int32 hdcp_version, int32 supported_eotfs,
-                    int32 dolby_vision_flags);
+                    int32 dolby_vision_flags, int32 screen_width_mm,
+                    int32 screen_height_mm, bool current_mode_supports_hdr,
+                    bool current_mode_supports_dolby_vision);
 };
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",
+  ]
+}
diff --git a/chromium/chromecast/net/BUILD.gn b/chromium/chromecast/net/BUILD.gn
index 6bd5eaaaf32..bae4aebaaee 100644
--- a/chromium/chromecast/net/BUILD.gn
+++ b/chromium/chromecast/net/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//testing/test.gni")
+
 source_set("net") {
   sources = [
     "connectivity_checker.cc",
@@ -32,3 +34,37 @@ source_set("net") {
     "//net",
   ]
 }
+
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "fake_stream_socket.cc",
+    "fake_stream_socket.h",
+    "mock_stream_socket.cc",
+    "mock_stream_socket.h",
+  ]
+
+  public_deps = [
+    "//testing/gmock",
+  ]
+
+  deps = [
+    "//base",
+    "//net",
+  ]
+}
+
+test("cast_net_unittests") {
+  sources = [
+    "fake_stream_socket_unittest.cc",
+  ]
+
+  deps = [
+    ":test_support",
+    "//base",
+    "//base/test:run_all_unittests",
+    "//net",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/chromecast/renderer/BUILD.gn b/chromium/chromecast/renderer/BUILD.gn
index 284f66a9e44..5dd2a3fb533 100644
--- a/chromium/chromecast/renderer/BUILD.gn
+++ b/chromium/chromecast/renderer/BUILD.gn
@@ -43,7 +43,7 @@ source_set("renderer") {
     "//gin:gin",
     "//ipc",
     "//media",
-    "//services/shell/public/cpp",
-    "//third_party/widevine/cdm:version_h",
+    "//services/service_manager/public/cpp",
+    "//third_party/widevine/cdm:headers",
   ]
 }