BASELINE: Update Chromium to 70.0.3538.78

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

6 files changed, 35 insertions, 10 deletions

diff --git a/chromium/build/util/BUILD.gn b/chromium/build/util/BUILD.gn
index 9f5a6f71a57..54c23c91c4a 100644
--- a/chromium/build/util/BUILD.gn
+++ b/chromium/build/util/BUILD.gn
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/util/lastchange.gni")
+
 action("webkit_version") {
   script = "version.py"
 
-  lastchange_file = "LASTCHANGE"
-
   template_file = "webkit_version.h.in"
   inputs = [
     lastchange_file,
diff --git a/chromium/build/util/LASTCHANGE b/chromium/build/util/LASTCHANGE
index 7738287b783..6255d691444 100644
--- a/chromium/build/util/LASTCHANGE
+++ b/chromium/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=cdec0adf58c577876de3d8f073dce520f0829431-refs/branch-heads/3497@{#988}
+LASTCHANGE=618d94a03dcd8ad478b6005f851e2c1ade8b5ffc-refs/branch-heads/3538@{#1042}
diff --git a/chromium/build/util/LASTCHANGE.committime b/chromium/build/util/LASTCHANGE.committime
new file mode 100644
index 00000000000..d6efc81c1e3
--- /dev/null
+++ b/chromium/build/util/LASTCHANGE.committime
@@ -0,0 +1 @@
+1540339741
\ No newline at end of file
diff --git a/chromium/build/util/LASTCHANGE.dummy b/chromium/build/util/LASTCHANGE.dummy
new file mode 100644
index 00000000000..21bb3c33c74
--- /dev/null
+++ b/chromium/build/util/LASTCHANGE.dummy
@@ -0,0 +1 @@
+LASTCHANGE=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
diff --git a/chromium/build/util/lastchange.gni b/chromium/build/util/lastchange.gni
new file mode 100644
index 00000000000..a13295900df
--- /dev/null
+++ b/chromium/build/util/lastchange.gni
@@ -0,0 +1,16 @@
+# Copyright 2018 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.
+
+# This file is used to inject fixed dummy commit for commit independent
+# reproducible binaries.
+
+declare_args() {
+  use_dummy_lastchange = false
+}
+
+if (use_dummy_lastchange) {
+  lastchange_file = "//build/util/LASTCHANGE.dummy"
+} else {
+  lastchange_file = "//build/util/LASTCHANGE"
+}
diff --git a/chromium/build/util/lastchange.py b/chromium/build/util/lastchange.py
index 19e3237c058..82c5f39432e 100755
--- a/chromium/build/util/lastchange.py
+++ b/chromium/build/util/lastchange.py
@@ -15,9 +15,10 @@ import subprocess
 import sys
 
 class VersionInfo(object):
-  def __init__(self, revision_id, full_revision_string):
+  def __init__(self, revision_id, full_revision_string, timestamp):
     self.revision_id = revision_id
     self.revision = full_revision_string
+    self.timestamp = timestamp
 
 
 def RunGitCommand(directory, command):
@@ -58,14 +59,14 @@ def FetchGitRevision(directory, filter):
     A VersionInfo object or None on error.
   """
   hsh = ''
-  git_args = ['log', '-1', '--format=%H']
+  git_args = ['log', '-1', '--format=%H %ct']
   if filter is not None:
     git_args.append('--grep=' + filter)
   proc = RunGitCommand(directory, git_args)
   if proc:
     output = proc.communicate()[0].strip()
     if proc.returncode == 0 and output:
-      hsh = output
+      hsh, ct = output.split()
     else:
       logging.error('Git error: rc=%d, output=%r' %
                     (proc.returncode, output))
@@ -80,7 +81,7 @@ def FetchGitRevision(directory, filter):
         if line.startswith('Cr-Commit-Position:'):
           pos = line.rsplit()[-1].strip()
           break
-  return VersionInfo(hsh, '%s-%s' % (hsh, pos))
+  return VersionInfo(hsh, '%s-%s' % (hsh, pos), int(ct))
 
 
 def FetchVersionInfo(directory=None, filter=None):
@@ -90,7 +91,7 @@ def FetchVersionInfo(directory=None, filter=None):
   """
   version_info = FetchGitRevision(directory, filter)
   if not version_info:
-    version_info = VersionInfo('0', '0')
+    version_info = VersionInfo('0', '0', 0)
   return version_info
 
 
@@ -136,6 +137,7 @@ def WriteIfChanged(file_name, contents):
   """
   Writes the specified contents to the specified file_name
   iff the contents are different than the current contents.
+  Returns if new data was written.
   """
   try:
     old_contents = open(file_name, 'r').read()
@@ -143,9 +145,10 @@ def WriteIfChanged(file_name, contents):
     pass
   else:
     if contents == old_contents:
-      return
+      return False
     os.unlink(file_name)
   open(file_name, 'w').write(contents)
+  return True
 
 
 def main(argv=None):
@@ -211,7 +214,11 @@ def main(argv=None):
       sys.stdout.write(contents)
     else:
       if out_file:
-        WriteIfChanged(out_file, contents)
+        committime_file = out_file + '.committime'
+        out_changed = WriteIfChanged(out_file, contents)
+        if out_changed or not os.path.exists(committime_file):
+          with open(committime_file, 'w') as timefile:
+            timefile.write(str(version_info.timestamp))
       if header:
         WriteIfChanged(header,
                        GetHeaderContents(header, opts.version_macro,