BASELINE: Update Chromium to 59.0.3071.134

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

2 files changed, 17 insertions, 15 deletions

diff --git a/chromium/chrome/installer/linux/BUILD.gn b/chromium/chrome/installer/linux/BUILD.gn
index b16c7239eff..9e5dafbcd95 100644
--- a/chromium/chrome/installer/linux/BUILD.gn
+++ b/chromium/chrome/installer/linux/BUILD.gn
@@ -85,9 +85,15 @@ copy("common_packaging_files") {
   ]
 
   if (is_chrome_branded) {
-    sources += [ "common/google-chrome/google-chrome.info" ]
+    sources += [
+      "common/google-chrome/google-chrome.appdata.xml.template",
+      "common/google-chrome/google-chrome.info",
+    ]
   } else {
-    sources += [ "common/chromium-browser/chromium-browser.info" ]
+    sources += [
+      "common/chromium-browser/chromium-browser.appdata.xml",
+      "common/chromium-browser/chromium-browser.info",
+    ]
   }
 
   if (current_cpu == "x86") {
@@ -109,9 +115,7 @@ copy("deb_packaging_files") {
     "debian/control.template",
     "debian/debian.menu",
     "debian/expected_deps_ia32_jessie",
-    "debian/expected_deps_ia32_wheezy",
     "debian/expected_deps_x64_jessie",
-    "debian/expected_deps_x64_wheezy",
     "debian/postinst",
     "debian/postrm",
     "debian/prerm",
diff --git a/chromium/chrome/installer/util/BUILD.gn b/chromium/chrome/installer/util/BUILD.gn
index c8012cacf4e..8d04ce75b23 100644
--- a/chromium/chrome/installer/util/BUILD.gn
+++ b/chromium/chrome/installer/util/BUILD.gn
@@ -26,12 +26,12 @@ import("//testing/test.gni")
 # with grit pak strings.
 #
 # In both of these cases, link to the ":with_no_strings" variant. However, this
-# is obviously a fragile and confusing situation. In the "I don't use strings
-# at all case", there is no definition of what works and doesn't work, and this
-# may also change over time. As an example at the time of this writing,
-# chrome.exe calls BrowserDistribution::GetRegistryPath. This function doesn't
-# use any strings, but lots of other functions in BrowserDistribution do use
-# localized strings.
+# is obviously a fragile and confusing situation. In the "I don't use strings at
+# all case", there is no definition of what works and doesn't work, and this may
+# also change over time. As an example at the time of this writing, chrome.exe
+# calls GoogleUpdateSettings::UpdateDidRunState. This function doesn't use any
+# strings, but lots of other functions in BrowserDistribution do use localized
+# strings.
 #
 # Ideally, this should be cleaved in two parts: the main "installer util" and
 # some kind of mini installer util that just contains the functions needed by
@@ -55,8 +55,6 @@ static_library("with_no_strings") {
     sources = [
       "chrome_browser_operations.cc",
       "chrome_browser_operations.h",
-      "compat_checks.cc",
-      "compat_checks.h",
       "delete_after_reboot_helper.cc",
       "delete_after_reboot_helper.h",
       "google_chrome_distribution.cc",
@@ -158,8 +156,6 @@ static_library("with_no_strings") {
       "duplicate_tree_detector.h",
       "firewall_manager_win.cc",
       "firewall_manager_win.h",
-      "google_chrome_sxs_distribution.cc",
-      "google_chrome_sxs_distribution.h",
       "google_update_constants.cc",
       "google_update_constants.h",
       "google_update_settings.cc",
@@ -245,6 +241,8 @@ action("generate_strings") {
   ]
 
   args = [
+    "-b",
+    "$branding_path_component",
     "-i",
     rebase_path(grdfile, root_build_dir) + ":resources",
     "-n",
@@ -277,7 +275,6 @@ if (is_win) {
 
   test("installer_util_unittests") {
     sources = [
-      "../setup/compat_checks_unittest.cc",
       "advanced_firewall_manager_win_unittest.cc",
       "beacons_unittest.cc",
       "callback_work_item_unittest.cc",
@@ -296,6 +293,7 @@ if (is_win) {
       "install_util_unittest.cc",
       "installer_util_test_common.cc",
       "installer_util_test_common.h",
+      "l10n_string_util_unittest.cc",
       "language_selector_unittest.cc",
       "legacy_firewall_manager_win_unittest.cc",
       "logging_installer_unittest.cc",