BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

6 files changed, 18 insertions, 31 deletions

diff --git a/chromium/chrome_elf/BUILD.gn b/chromium/chrome_elf/BUILD.gn
index c2861e0f682..53a29c879fe 100644
--- a/chromium/chrome_elf/BUILD.gn
+++ b/chromium/chrome_elf/BUILD.gn
@@ -53,9 +53,6 @@ shared_library("chrome_elf") {
   configs += [ "//build/config/win:windowed" ]
   configs -= [ "//build/config/win:console" ]
 
-  # Turn on CFG for this project.
-  configs += [ "//build/config/win:win_msvc_cfg" ]
-
   # Delay loads in this list will prevent user32.dll
   # from loading too early.
   ldflags = [
diff --git a/chromium/chrome_elf/OWNERS b/chromium/chrome_elf/OWNERS
index b90211bd397..acc25394a65 100644
--- a/chromium/chrome_elf/OWNERS
+++ b/chromium/chrome_elf/OWNERS
@@ -2,3 +2,5 @@ caitkp@chromium.org
 robertshield@chromium.org
 # For early browser process security and nt_registry:
 pennymac@chromium.org
+
+# COMPONENT: Internals>Core
diff --git a/chromium/chrome_elf/PRESUBMIT.py b/chromium/chrome_elf/PRESUBMIT.py
index 6827104dbd9..952b6eac603 100644
--- a/chromium/chrome_elf/PRESUBMIT.py
+++ b/chromium/chrome_elf/PRESUBMIT.py
@@ -8,31 +8,15 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 
-import re
-
 def PostUploadHook(cl, change, output_api):
   """git cl upload will call this hook after the issue is created/modified.
 
   This hook adds extra try bots list to the CL description in order to run
   tests on the Windows 10 try bot in addition to CQ try bots.
   """
-  rietveld_obj = cl.RpcServer()
-  issue = cl.issue
-  description = rietveld_obj.get_description(issue)
-  if re.search(r'^CQ_INCLUDE_TRYBOTS=.*', description, re.M | re.I):
-    return []
-
-  bots = [
-    'master.tryserver.chromium.win:win10_chromium_x64_rel_ng',
-  ]
-
-  results = []
-  new_description = description
-  new_description += '\nCQ_INCLUDE_TRYBOTS=%s' % ';'.join(bots)
-  results.append(output_api.PresubmitNotifyResult(
-      'Automatically added Win10 bot to run on CQ.'))
-
-  if new_description != description:
-    rietveld_obj.update_description(issue, new_description)
-
-  return results
+  return output_api.EnsureCQIncludeTrybotsAreAdded(
+    cl,
+    [
+      'master.tryserver.chromium.win:win10_chromium_x64_rel_ng',
+    ],
+    'Automatically added Win10 bot to run on CQ.')
diff --git a/chromium/chrome_elf/blacklist/OWNERS b/chromium/chrome_elf/blacklist/OWNERS
index 28a6a305588..23a4824d031 100644
--- a/chromium/chrome_elf/blacklist/OWNERS
+++ b/chromium/chrome_elf/blacklist/OWNERS
@@ -1,3 +1,5 @@
 caitkp@chromium.org
 csharp@chromium.org
 robertshield@chromium.org
+
+# COMPONENT: Internals>Core
diff --git a/chromium/chrome_elf/chrome_elf_util_unittest.cc b/chromium/chrome_elf/chrome_elf_util_unittest.cc
index 3a9f441944b..db25af06171 100644
--- a/chromium/chrome_elf/chrome_elf_util_unittest.cc
+++ b/chromium/chrome_elf/chrome_elf_util_unittest.cc
@@ -63,10 +63,10 @@ void RegRedirect(nt::ROOT_KEY key,
   base::string16 temp;
 
   if (key == nt::HKCU) {
-    rom->OverrideRegistry(HKEY_CURRENT_USER, &temp);
+    ASSERT_NO_FATAL_FAILURE(rom->OverrideRegistry(HKEY_CURRENT_USER, &temp));
     ASSERT_TRUE(nt::SetTestingOverride(nt::HKCU, temp));
   } else {
-    rom->OverrideRegistry(HKEY_LOCAL_MACHINE, &temp);
+    ASSERT_NO_FATAL_FAILURE(rom->OverrideRegistry(HKEY_LOCAL_MACHINE, &temp));
     ASSERT_TRUE(nt::SetTestingOverride(nt::HKLM, temp));
   }
 }
@@ -85,7 +85,7 @@ TEST(ChromeElfUtilTest, BrowserProcessSecurityTest) {
 
   // Set up registry override for this test.
   registry_util::RegistryOverrideManager override_manager;
-  RegRedirect(nt::HKCU, &override_manager);
+  ASSERT_NO_FATAL_FAILURE(RegRedirect(nt::HKCU, &override_manager));
 
   // First, ensure that the emergency-off finch signal works.
   EXPECT_TRUE(SetSecurityFinchFlag(true));
@@ -97,7 +97,7 @@ TEST(ChromeElfUtilTest, BrowserProcessSecurityTest) {
   elf_security::EarlyBrowserSecurity();
   EXPECT_TRUE(IsSecuritySet());
 
-  CancelRegRedirect(nt::HKCU);
+  ASSERT_NO_FATAL_FAILURE(CancelRegRedirect(nt::HKCU));
 }
 
 }  // namespace
diff --git a/chromium/chrome_elf/nt_registry/nt_registry_unittest.cc b/chromium/chrome_elf/nt_registry/nt_registry_unittest.cc
index d2020429fad..0d54cb5f753 100644
--- a/chromium/chrome_elf/nt_registry/nt_registry_unittest.cc
+++ b/chromium/chrome_elf/nt_registry/nt_registry_unittest.cc
@@ -294,9 +294,11 @@ class NtRegistryTest : public testing::Test {
  protected:
   void SetUp() override {
     base::string16 temp;
-    override_manager_.OverrideRegistry(HKEY_CURRENT_USER, &temp);
+    ASSERT_NO_FATAL_FAILURE(
+        override_manager_.OverrideRegistry(HKEY_CURRENT_USER, &temp));
     ASSERT_TRUE(nt::SetTestingOverride(nt::HKCU, temp));
-    override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, &temp);
+    ASSERT_NO_FATAL_FAILURE(
+        override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, &temp));
     ASSERT_TRUE(nt::SetTestingOverride(nt::HKLM, temp));
   }