BASELINE: Update Chromium to 60.0.3112.70

Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

10 files changed, 107 insertions, 18 deletions

diff --git a/chromium/chromecast/BUILD.gn b/chromium/chromecast/BUILD.gn
index 8acb91fb308..e2b9e487c42 100644
--- a/chromium/chromecast/BUILD.gn
+++ b/chromium/chromecast/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
-import("//build/config/locales.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//chromecast/build/tests/cast_test.gni")
@@ -34,6 +33,7 @@ cast_test_group("cast_tests") {
     "//chromecast/base/component:cast_component_unittests",
     "//chromecast/crypto:cast_crypto_unittests",
     "//chromecast/media:cast_media_unittests",
+    "//chromecast/net:cast_net_unittests",
     "//chromecast/system/reboot:cast_reboot_unittests",
     "//content/test:content_unittests",
     "//crypto:crypto_unittests",
@@ -42,7 +42,7 @@ cast_test_group("cast_tests") {
     "//net:net_unittests",
     "//sandbox/linux:sandbox_linux_unittests",
     "//sql:sql_unittests",
-    "//storage/browser:storage_unittests",
+    "//storage:storage_unittests",
     "//third_party/cacheinvalidation:cacheinvalidation_unittests",
     "//ui/base:ui_base_unittests",
   ]
@@ -60,7 +60,11 @@ cast_test_group("cast_tests") {
   }
 
   if (!is_android && use_alsa) {
-    tests += [ "//chromecast/media/cma/backend/alsa:cast_alsa_cma_backend_unittests" ]
+    tests += [
+      "//chromecast/media/cma/backend/alsa:cast_alsa_cma_backend_unittests",
+      "//chromecast/media/cma/backend/alsa:libcast_governor_unittests",
+      "//chromecast/media/cma/backend/alsa:slew_volume_unittests",
+    ]
   }
 
   if (!is_android) {
@@ -308,6 +312,7 @@ if (is_android) {
     test_type = "junit"
     tests = [
       "//base:base_junit_tests",
+      "//chromecast/browser/android:cast_shell_junit_tests",
       "//content/public/android:content_junit_tests",
       "//net/android:net_junit_tests",
       "//testing/android/junit:junit_unit_tests",
@@ -322,6 +327,9 @@ if (is_android) {
     run_list_path = "$root_out_dir/junit/run_junit_test_list.txt"
     build_tests = true
     test_groups = [ ":cast_junit_tests" ]
+    if (chromecast_branding != "public") {
+      test_groups += [ "//chromecast/internal:internal_cast_junit_tests" ]
+    }
   }
 }
 
@@ -372,7 +380,7 @@ executable("cast_shell") {
   deps = [
     ":cast_shell_lib",
     ":chromecast_locales_pak",
-    "//build/config/sanitizers:deps",
+    "//build/config:exe_and_shlib_deps",
     "//chromecast/app",
     "//content/public/app:both",
   ]
@@ -417,11 +425,11 @@ repack("cast_shell_pak") {
 }
 
 # Intermediate targets that repack grit resources by locale. For each locale
-# in |locales_with_fake_bidi| (see //build/config/locales.gni), all resources
+# in |cast_locales| (see //chromecast/chromecast.gni), all resources
 # are packed into a single .pak file in an output directory. These targets
 # should not be depended on directly; depend on ":chromecast_locales_pak"
 # instead.
-foreach(locale, locales_with_fake_bidi) {
+foreach(locale, cast_locales) {
   repack("_cast_repack_${locale}") {
     visibility = [ ":chromecast_locales_pak" ]
     output = "$root_out_dir/chromecast_locales/${locale}.pak"
@@ -447,7 +455,7 @@ foreach(locale, locales_with_fake_bidi) {
 # A meta-target which repacks resources by locale.
 group("chromecast_locales_pak") {
   deps = []
-  foreach(locale, locales_with_fake_bidi) {
+  foreach(locale, cast_locales) {
     deps += [ ":_cast_repack_${locale}" ]
   }
 }
diff --git a/chromium/chromecast/app/BUILD.gn b/chromium/chromecast/app/BUILD.gn
index c96064b8348..885334c3107 100644
--- a/chromium/chromecast/app/BUILD.gn
+++ b/chromium/chromecast/app/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/locales.gni")
+import("//chromecast/chromecast.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ -109,7 +109,7 @@ grit("chromecast_settings") {
   outputs = [
     "grit/chromecast_settings.h",
   ]
-  foreach(locale, locales_with_fake_bidi) {
+  foreach(locale, cast_locales) {
     outputs += [ "chromecast_settings_${locale}.pak" ]
   }
 
@@ -121,8 +121,8 @@ grit("chromecast_settings") {
 # This target ensures that Chromecast developers are notified when locales
 # change. If this target is breaking the build, the CAST_LOCALES list in
 # //chromecast/app/verify_cast_locales.py must be updated to match
-# |locales_with_fake_bidi|. Please see that file for more details. This action
-# will be run on fresh builds, and whenever |locales_with_fake_bidi| is updated.
+# |cast_locales|. Please see that file for more details. This action will be
+# run on fresh builds, and whenever |cast_locales| is updated.
 action("verify_cast_locales") {
   script = "//chromecast/app/verify_cast_locales.py"
 
@@ -133,7 +133,7 @@ action("verify_cast_locales") {
     rebase_path(stamp_file, "$root_out_dir"),
   ]
 
-  args += locales_with_fake_bidi
+  args += cast_locales
 
   outputs = [
     stamp_file,
diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn
index fcf8b87ad3e..54d84bf7018 100644
--- a/chromium/chromecast/browser/android/BUILD.gn
+++ b/chromium/chromecast/browser/android/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//chromecast/chromecast.gni")
 import("//build/config/android/rules.gni")
 
 assert(is_android)
@@ -14,6 +15,18 @@ jinja_template("cast_shell_manifest") {
   output = cast_shell_android_manifest
 }
 
+java_cpp_template("cast_shell_build_config_gen") {
+  sources = [
+    "apk/templates/BuildConfig.template",
+  ]
+  package_path = "org/chromium/chromecast/shell"
+
+  defines = []
+  if (display_web_contents_in_service) {
+    defines += [ "_DISPLAY_WEB_CONTENTS_IN_SERVICE" ]
+  }
+}
+
 android_resources("cast_shell_android_resources") {
   android_manifest = cast_shell_android_manifest
   android_manifest_dep = ":cast_shell_manifest"
@@ -32,10 +45,15 @@ android_library("cast_shell_java") {
     "$java_src_dir/org/chromium/chromecast/shell/CastMetricsHelper.java",
     "$java_src_dir/org/chromium/chromecast/shell/CastSysInfoAndroid.java",
     "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsActivity.java",
+    "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsService.java",
+    "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsComponent.java",
+    "$java_src_dir/org/chromium/chromecast/shell/LogcatExtractor.java",
   ]
 
   android_manifest = cast_shell_android_manifest
 
+  srcjar_deps = [ ":cast_shell_build_config_gen" ]
+
   deps = [
     ":cast_shell_android_resources",
     ":cast_shell_manifest",
@@ -51,3 +69,16 @@ android_library("cast_shell_java") {
     "//ui/android:ui_java",
   ]
 }
+
+junit_binary("cast_shell_junit_tests") {
+  java_files = [ "junit/src/org/chromium/chromecast/shell/CastWebContentsComponentTest.java" ]
+
+  srcjar_deps = [ ":cast_shell_build_config_gen" ]
+
+  deps = [
+    ":cast_shell_java",
+    "//base:base_java_test_support",
+    "//content/public/android:content_java",
+    "//third_party/android_tools:android_support_core_utils_java",
+  ]
+}
diff --git a/chromium/chromecast/build/tests/cast_test.gni b/chromium/chromecast/build/tests/cast_test.gni
index b39870eafee..2da7866573b 100644
--- a/chromium/chromecast/build/tests/cast_test.gni
+++ b/chromium/chromecast/build/tests/cast_test.gni
@@ -67,6 +67,7 @@
 #     runtime_deps_path = "$root_out_dir/path/to/list/runtime_deps.json"
 #   }
 
+import("//chromecast/chromecast.gni")
 import("//testing/test.gni")
 
 # Do not allow mixing of gtests and junit tests. All gtests must go into one
@@ -433,5 +434,9 @@ template("cast_test_group_list") {
     if (defined(_build_tests)) {
       deps += _build_tests
     }
+
+    if (chromecast_branding != "public") {
+      deps += [ "//chromecast/internal:cast_test_checker" ]
+    }
   }
 }
diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni
index ec300c53d1e..64d3f74bc14 100644
--- a/chromium/chromecast/chromecast.gni
+++ b/chromium/chromecast/chromecast.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/chromecast_build.gni")
+import("//build/config/locales.gni")
 
 # This args block should contain arguments used within the //chromecast
 # directory. Arguments which are used in other Chrome components should
@@ -23,6 +24,11 @@ declare_args() {
   # doing engineering builds.
   cast_is_debug = is_debug
 
+  if (is_android) {
+    # If true, run receiver apps in an Android service instead of an activity.
+    display_web_contents_in_service = is_cast_audio_only
+  }
+
   # If true, Chromecast WebUI resources are included in a build.
   # TODO(antz): default to false for audio-only builds, might need further
   # clean up (b/27119303)
@@ -46,3 +52,8 @@ if (chromecast_branding == "public") {
   cast_build_release =
       read_file("//chromecast/internal/build/cast_build_release", "trim string")
 }
+
+# All locales supported by Cast builds. This provides a single point of
+# reference for all GN files referencing a locales list. |locales| is declared
+# in //build/config/locales.gni.
+cast_locales = locales
diff --git a/chromium/chromecast/graphics/BUILD.gn b/chromium/chromecast/graphics/BUILD.gn
index 1c4c0b861c7..ad8699e053f 100644
--- a/chromium/chromecast/graphics/BUILD.gn
+++ b/chromium/chromecast/graphics/BUILD.gn
@@ -16,7 +16,7 @@ source_set("graphics") {
     "//ui/gfx",
   ]
 
-  if (use_aura && !is_cast_audio_only) {
+  if (use_aura) {
     sources += [
       "cast_focus_client_aura.cc",
       "cast_focus_client_aura.h",
diff --git a/chromium/chromecast/media/BUILD.gn b/chromium/chromecast/media/BUILD.gn
index 5f599d9bde7..698f77f59ef 100644
--- a/chromium/chromecast/media/BUILD.gn
+++ b/chromium/chromecast/media/BUILD.gn
@@ -31,6 +31,7 @@ test("cast_media_unittests") {
     "//chromecast/base/metrics:test_support",
     "//chromecast/public",
     "//media",
+    "//media/audio:test_support",
     "//media/base:test_support",
     "//testing/gmock",
     "//testing/gtest",
diff --git a/chromium/chromecast/media/cma/backend/alsa/BUILD.gn b/chromium/chromecast/media/cma/backend/alsa/BUILD.gn
index f45d0df79f7..63dfa3609e7 100644
--- a/chromium/chromecast/media/cma/backend/alsa/BUILD.gn
+++ b/chromium/chromecast/media/cma/backend/alsa/BUILD.gn
@@ -21,6 +21,8 @@ shared_library("libcast_media_1.0_audio") {
   sources = [
     "cast_media_shlib.cc",
     "media_codec_support_cast_audio.cc",
+    "post_processing_pipeline_impl.cc",
+    "post_processing_pipeline_impl.h",
   ]
 
   deps = [
@@ -28,6 +30,7 @@ shared_library("libcast_media_1.0_audio") {
     "//base",
     "//chromecast/base",
     "//chromecast/public",
+    "//chromecast/public/media",
     "//media",
   ]
 }
@@ -44,7 +47,6 @@ source_set("alsa_cma_backend") {
     "filter_group.h",
     "media_pipeline_backend_alsa.cc",
     "media_pipeline_backend_alsa.h",
-    "post_processing_pipeline.cc",
     "post_processing_pipeline.h",
     "post_processing_pipeline_parser.cc",
     "post_processing_pipeline_parser.h",
@@ -132,15 +134,48 @@ source_set("test_support") {
   ]
 }
 
+test("slew_volume_unittests") {
+  sources = [
+    "slew_volume_unittests.cc",
+  ]
+  deps = [
+    ":slew_volume",
+    "//base",
+    "//base/test:run_all_unittests",
+    "//media",
+    "//testing/gtest",
+  ]
+}
+
 shared_library("libcast_governor_1.0") {
+  deps = [
+    ":governor",
+  ]
+}
+
+test("libcast_governor_unittests") {
   sources = [
-    "post_processors/governor_shlib.cc",
+    "post_processors/governor_unittest.cc",
+  ]
+  deps = [
+    ":governor",
+    "//base",
+    "//base/test:run_all_unittests",
+    "//media",
+    "//testing/gtest",
   ]
+}
 
+source_set("governor") {
+  sources = [
+    "post_processors/governor.cc",
+    "post_processors/governor.h",
+  ]
   deps = [
     ":slew_volume",
     "//base",
     "//chromecast/base",
     "//chromecast/public/media",
   ]
+  public_configs = [ "//chromecast/public:public_config" ]
 }
diff --git a/chromium/chromecast/media/cma/decoder/BUILD.gn b/chromium/chromecast/media/cma/decoder/BUILD.gn
index 5adf546bde9..be40a3caf04 100644
--- a/chromium/chromecast/media/cma/decoder/BUILD.gn
+++ b/chromium/chromecast/media/cma/decoder/BUILD.gn
@@ -4,9 +4,8 @@
 
 source_set("decoder") {
   sources = [
+    "cast_audio_decoder.cc",
     "cast_audio_decoder.h",
-    "cast_audio_decoder_android.cc",
-    "cast_audio_decoder_linux.cc",
   ]
 
   deps = [
diff --git a/chromium/chromecast/renderer/BUILD.gn b/chromium/chromecast/renderer/BUILD.gn
index bb5a1c4a20d..ea4bd19fae6 100644
--- a/chromium/chromecast/renderer/BUILD.gn
+++ b/chromium/chromecast/renderer/BUILD.gn
@@ -30,7 +30,6 @@ source_set("renderer") {
     "//chromecast/common/media",
     "//chromecast/crash",
     "//chromecast/media",
-    "//chromecast/media",
     "//components/network_hints/renderer",
     "//content/public/common",
     "//content/public/renderer",