BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

7 files changed, 25 insertions, 243 deletions

diff --git a/chromium/chrome/installer/gcapi_mac/BUILD.gn b/chromium/chrome/installer/gcapi_mac/BUILD.gn
index dd1103bd284..abf34de4186 100644
--- a/chromium/chrome/installer/gcapi_mac/BUILD.gn
+++ b/chromium/chrome/installer/gcapi_mac/BUILD.gn
@@ -21,6 +21,7 @@ config("gcapi_config") {
 
 static_library("gcapi_lib") {
   complete_static_lib = true
+  configs -= [ "//build/config/compiler:thin_archive" ]
   sources = [
     "gcapi.h",
     "gcapi.mm",
diff --git a/chromium/chrome/installer/linux/BUILD.gn b/chromium/chrome/installer/linux/BUILD.gn
index 2ea8f903186..fbabd6c3414 100644
--- a/chromium/chrome/installer/linux/BUILD.gn
+++ b/chromium/chrome/installer/linux/BUILD.gn
@@ -49,10 +49,8 @@ if (enable_nacl) {
 
 # The widevine BUILD.gn only produces shared libraries for x86 and x64
 if (is_chrome_branded && (current_cpu == "x86" || current_cpu == "x64")) {
-  packaging_files_shlibs += [
-    "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
-    "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
-  ]
+  packaging_files_shlibs +=
+      [ "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so" ]
 }
 
 if (!libcpp_is_static && use_custom_libcxx) {
@@ -370,10 +368,7 @@ group("installer_deps") {
     ]
   }
   if (current_cpu == "x86" || current_cpu == "x64") {
-    public_deps += [
-      "//third_party/widevine/cdm:widevinecdm",
-      "//third_party/widevine/cdm:widevinecdmadapter",
-    ]
+    public_deps += [ "//third_party/widevine/cdm" ]
   }
   if (!is_chromeos) {
     public_deps += [ ":rpm_packaging_files" ]
diff --git a/chromium/chrome/installer/mini_installer/BUILD.gn b/chromium/chrome/installer/mini_installer/BUILD.gn
index c44f8a11059..c365088b90b 100644
--- a/chromium/chrome/installer/mini_installer/BUILD.gn
+++ b/chromium/chrome/installer/mini_installer/BUILD.gn
@@ -6,7 +6,6 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/process_version_rc_template.gni")
-import("//chrome/test/mini_installer/mini_installer_test.gni")
 import("//components/nacl/features.gni")
 import("//third_party/icu/config.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
@@ -54,15 +53,6 @@ source_set("lib") {
   }
 
   configs += [ ":mini_installer_compiler_flags" ]
-
-  # This input dependency on the mini installer test Python files will force a
-  # recompilation when any of the Python files have changed. This will then
-  # invalidate the build and trigger running the test on the bots even when
-  # no other Chrome files have changed. These have to be inputs rather than a
-  # dependency because a dependency won't actually trigger recompiles in
-  # incremental build cases unless a source file actually references one of the
-  # dependency outputs.
-  inputs = mini_installer_test_files
 }
 
 process_version_rc_template("version") {
@@ -270,19 +260,30 @@ template("generate_mini_installer") {
       "/NXCOMPAT",
     ]
 
-    if (!is_asan) {
-      ldflags += [ "/ENTRY:MainEntryPoint" ]
-    }
-
     libs = [ "setupapi.lib" ]
 
     deps = [
       ":$archive_name",
       ":lib",
       ":version",
-      "//build/config:exe_and_shlib_deps",
       "//build/win:default_exe_manifest",
     ]
+
+    # In general, mini_installer tries to avoid depending on the C++ standard
+    # library for size reasons. This is achieved by setting a custom entry point
+    # (which avoids pulling in the standard library via a link dependency) as
+    # well as by not depending on exe_and_shlib_deps (which depends on
+    # libc++ in use_custom_libcxx=true builds).
+    #
+    # But in asan builds we need to link against the asan runtime library, which
+    # in turn depends on the standard library and relies on it to run
+    # initializers. So in asan builds we depend on exe_and_shlib_deps for the
+    # asan runtime and use the standard entry point.
+    if (is_asan) {
+      deps += [ "//build/config:exe_and_shlib_deps" ]
+    } else {
+      ldflags += [ "/ENTRY:MainEntryPoint" ]
+    }
   }
 }
 
@@ -292,14 +293,6 @@ generate_mini_installer("mini_installer") {
   chrome_dll_target = "//chrome:main_dll"
 }
 
-if (is_syzyasan) {
-  generate_mini_installer("mini_installer_syzygy") {
-    out_dir = "$root_out_dir/syzygy/"
-    chrome_dll_file = "$root_out_dir/syzygy/chrome.dll"
-    chrome_dll_target = "//chrome/tools/build/win/syzygy:chrome_dll_syzygy"
-  }
-}
-
 # next_version_mini_installer.exe can't be generated in an x86 Debug component
 # build because it requires too much memory.
 # TODO(thakis): Enable this in cross builds, https://crbug.com/799827
@@ -325,13 +318,3 @@ if (!(is_component_build && is_debug && target_cpu == "x86") &&
     ]
   }
 }
-
-if (is_win) {
-  group("mini_installer_tests") {
-    testonly = true
-    data_deps = [
-      ":mini_installer",
-      ":next_version_mini_installer",
-    ]
-  }
-}
diff --git a/chromium/chrome/installer/setup/BUILD.gn b/chromium/chrome/installer/setup/BUILD.gn
index c15e6aaae7f..c0a42c15a17 100644
--- a/chromium/chrome/installer/setup/BUILD.gn
+++ b/chromium/chrome/installer/setup/BUILD.gn
@@ -58,8 +58,6 @@ if (is_win) {
       "installer_crash_reporting.h",
       "installer_state.cc",
       "installer_state.h",
-      "persistent_histogram_storage.cc",
-      "persistent_histogram_storage.h",
       "progress_calculator.cc",
       "progress_calculator.h",
       "setup_constants.cc",
@@ -85,12 +83,12 @@ if (is_win) {
       "//chrome/common:version_header",
       "//chrome/install_static:install_static_util",
       "//chrome/installer/util:with_rc_strings",
-      "//chrome/installer/zucchini:zucchini_io",
-      "//chrome/installer/zucchini:zucchini_lib",
       "//chrome_elf:constants",
       "//components/base32",
       "//components/crash/content/app",
       "//components/crash/core/common",
+      "//components/zucchini:zucchini_io",
+      "//components/zucchini:zucchini_lib",
       "//content/public/common:static_switches",
       "//courgette:courgette_lib",
       "//rlz:rlz_lib",
diff --git a/chromium/chrome/installer/setup/buildflags.gni b/chromium/chrome/installer/setup/buildflags.gni
index 2d2867edf72..28a0ebbda0a 100644
--- a/chromium/chrome/installer/setup/buildflags.gni
+++ b/chromium/chrome/installer/setup/buildflags.gni
@@ -4,6 +4,6 @@
 
 declare_args() {
   # Specify if the Zucchini patcher features should be included in setup.exe.
-  # See //chrome/installer/zucchini for more information.
+  # See //components/zucchini for more information.
   use_zucchini = false
 }
diff --git a/chromium/chrome/installer/util/BUILD.gn b/chromium/chrome/installer/util/BUILD.gn
index 2cf4027737f..c66a6f6245e 100644
--- a/chromium/chrome/installer/util/BUILD.gn
+++ b/chromium/chrome/installer/util/BUILD.gn
@@ -106,7 +106,7 @@ static_library("with_no_strings") {
       "//components/metrics",
       "//courgette:courgette_lib",
       "//crypto",
-      "//rlz/features",
+      "//rlz/buildflags",
       "//third_party/bspatch",
       "//third_party/crashpad/crashpad/client",
       "//third_party/icu",
@@ -342,7 +342,7 @@ if (is_win) {
       "//chrome/installer/setup:lib",
       "//chrome/installer/test:alternate_version_generator_lib",
       "//components/variations",
-      "//rlz/features",
+      "//rlz/buildflags",
       "//testing/gmock",
       "//testing/gtest",
     ]
diff --git a/chromium/chrome/installer/zucchini/BUILD.gn b/chromium/chrome/installer/zucchini/BUILD.gn
deleted file mode 100644
index 47eef3adfad..00000000000
--- a/chromium/chrome/installer/zucchini/BUILD.gn
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 2017 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("//chrome/process_version_rc_template.gni")
-import("//testing/libfuzzer/fuzzer_test.gni")
-import("//testing/test.gni")
-
-static_library("zucchini_lib") {
-  sources = [
-    "abs32_utils.cc",
-    "abs32_utils.h",
-    "address_translator.cc",
-    "address_translator.h",
-    "algorithm.h",
-    "binary_data_histogram.cc",
-    "binary_data_histogram.h",
-    "buffer_sink.cc",
-    "buffer_sink.h",
-    "buffer_source.cc",
-    "buffer_source.h",
-    "buffer_view.h",
-    "crc32.cc",
-    "crc32.h",
-    "disassembler.cc",
-    "disassembler.h",
-    "disassembler_no_op.cc",
-    "disassembler_no_op.h",
-    "disassembler_win32.cc",
-    "disassembler_win32.h",
-    "element_detection.cc",
-    "element_detection.h",
-    "encoded_view.cc",
-    "encoded_view.h",
-    "ensemble_matcher.cc",
-    "ensemble_matcher.h",
-    "equivalence_map.cc",
-    "equivalence_map.h",
-    "heuristic_ensemble_matcher.cc",
-    "heuristic_ensemble_matcher.h",
-    "image_index.cc",
-    "image_index.h",
-    "image_utils.h",
-    "io_utils.cc",
-    "io_utils.h",
-    "label_manager.cc",
-    "label_manager.h",
-    "patch_reader.cc",
-    "patch_reader.h",
-    "patch_utils.h",
-    "patch_writer.cc",
-    "patch_writer.h",
-    "reference_set.cc",
-    "reference_set.h",
-    "rel32_finder.cc",
-    "rel32_finder.h",
-    "rel32_utils.cc",
-    "rel32_utils.h",
-    "reloc_utils.cc",
-    "reloc_utils.h",
-    "suffix_array.h",
-    "target_pool.cc",
-    "target_pool.h",
-    "targets_affinity.cc",
-    "targets_affinity.h",
-    "type_win_pe.h",
-    "typed_value.h",
-    "zucchini.h",
-    "zucchini_apply.cc",
-    "zucchini_apply.h",
-    "zucchini_gen.cc",
-    "zucchini_gen.h",
-    "zucchini_tools.cc",
-    "zucchini_tools.h",
-  ]
-
-  deps = [
-    "//base",
-  ]
-}
-
-static_library("zucchini_io") {
-  sources = [
-    "mapped_file.cc",
-    "mapped_file.h",
-    "zucchini_integration.cc",
-    "zucchini_integration.h",
-  ]
-
-  deps = [
-    ":zucchini_lib",
-    "//base",
-  ]
-}
-
-executable("zucchini") {
-  sources = [
-    "main_utils.cc",
-    "main_utils.h",
-    "zucchini_commands.cc",
-    "zucchini_commands.h",
-    "zucchini_main.cc",
-  ]
-
-  deps = [
-    ":zucchini_io",
-    ":zucchini_lib",
-    "//base",
-    "//build/config:exe_and_shlib_deps",
-  ]
-
-  if (is_win) {
-    deps += [ ":zucchini_exe_version" ]
-  }
-}
-
-if (is_win) {
-  process_version_rc_template("zucchini_exe_version") {
-    template_file = "zucchini_exe_version.rc.version"
-    output = "$target_gen_dir/zucchini_exe_version.rc"
-  }
-}
-
-fuzzer_test("zucchini_patch_fuzzer") {
-  sources = [
-    "patch_fuzzer.cc",
-  ]
-  deps = [
-    ":zucchini_lib",
-    "//base",
-  ]
-  seed_corpus = "testdata/patch_fuzzer"
-}
-
-test("zucchini_unittests") {
-  sources = [
-    "abs32_utils_unittest.cc",
-    "address_translator_unittest.cc",
-    "algorithm_unittest.cc",
-    "binary_data_histogram_unittest.cc",
-    "buffer_sink_unittest.cc",
-    "buffer_source_unittest.cc",
-    "buffer_view_unittest.cc",
-    "crc32_unittest.cc",
-    "element_detection_unittest.cc",
-    "encoded_view_unittest.cc",
-    "equivalence_map_unittest.cc",
-    "image_index_unittest.cc",
-    "image_utils_unittest.cc",
-    "io_utils_unittest.cc",
-    "label_manager_unittest.cc",
-    "mapped_file_unittest.cc",
-    "patch_read_write_unittest.cc",
-    "patch_utils_unittest.cc",
-    "reference_set_unittest.cc",
-    "rel32_finder_unittest.cc",
-    "rel32_utils_unittest.cc",
-    "reloc_utils_unittest.cc",
-    "suffix_array_unittest.cc",
-    "target_pool_unittest.cc",
-    "targets_affinity_unittest.cc",
-    "test_disassembler.cc",
-    "test_disassembler.h",
-    "test_reference_reader.cc",
-    "test_reference_reader.h",
-    "test_utils.cc",
-    "test_utils.h",
-    "typed_value_unittest.cc",
-    "zucchini_apply_unittest.cc",
-    "zucchini_gen_unittest.cc",
-  ]
-
-  deps = [
-    ":zucchini_io",
-    ":zucchini_lib",
-    "//base",
-    "//base/test:run_all_unittests",
-    "//base/test:test_support",
-    "//testing/gtest",
-  ]
-}
-
-test("zucchini_integration_test") {
-  sources = [
-    "integration_test.cc",
-  ]
-
-  deps = [
-    ":zucchini_lib",
-    "//base",
-    "//base/test:run_all_unittests",
-    "//base/test:test_support",
-    "//testing/gtest",
-  ]
-}