BASELINE: Update Chromium to 67.0.3396.47

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

6 files changed, 22 insertions, 9 deletions

diff --git a/chromium/buildtools/DEPS b/chromium/buildtools/DEPS
index 386b23a0f22..62bd2718b34 100644
--- a/chromium/buildtools/DEPS
+++ b/chromium/buildtools/DEPS
@@ -3,16 +3,17 @@ use_relative_paths = True
 vars = {
   "chromium_url": "https://chromium.googlesource.com",
 
-  "clang_format_rev": "0653eee0c81ea04715c635dd0885e8096ff6ba6d",   # r302580
-  "libcxx_revision": "27c341db41bc9df5c6f19cde65f002d6f1c2eb3c",    # r323563
-  "libcxxabi_revision": "e1601db2504857d44db88a5d4e2ca50b32bbb7d9", # r323495
-  "libunwind_revision": "86ab23972978242b6f9e27cebc239f3e8428b1af", # r323499
+  # When changing these, also update the svn revisions in deps_revisions.gni
+  "clang_format_revision": "0653eee0c81ea04715c635dd0885e8096ff6ba6d",
+  "libcxx_revision":       "ece1de8658d749e19c12cacd4458cc330eca94e3",
+  "libcxxabi_revision":    "52c7a3760aef1df328a9bc957f686410872f0dc0",
+  "libunwind_revision":    "0f3cbe4123f8afacd646bd4f5414aa6528ef8129",
 }
 
 deps = {
   "clang_format/script":
     Var("chromium_url") + "/chromium/llvm-project/cfe/tools/clang-format.git@" +
-    Var("clang_format_rev"),
+    Var("clang_format_revision"),
   "third_party/libc++/trunk":
     Var("chromium_url") + "/chromium/llvm-project/libcxx.git" + "@" +
     Var("libcxx_revision"),
diff --git a/chromium/buildtools/deps_revisions.gni b/chromium/buildtools/deps_revisions.gni
new file mode 100644
index 00000000000..ed7db854dde
--- /dev/null
+++ b/chromium/buildtools/deps_revisions.gni
@@ -0,0 +1,12 @@
+# 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.
+
+declare_args() {
+  # The svn revisions that belong to the git hashes in DEPS. Used to cause full
+  # rebuilds on libc++ rolls.
+  clang_format_svn_revision = "302580"
+  libcxx_svn_revision =       "329375"
+  libcxxabi_svn_revision =    "329629"
+  libunwind_svn_revision =    "329340"
+}
diff --git a/chromium/buildtools/linux64/gn.sha1 b/chromium/buildtools/linux64/gn.sha1
index 54d89d74fe1..ff9b86371ea 100644
--- a/chromium/buildtools/linux64/gn.sha1
+++ b/chromium/buildtools/linux64/gn.sha1
@@ -1 +1 @@
-ed8b2bc0617fee4ebd1d1a35e8a5bc168c4ca874
+c5665261bd0dba0898c50e609837f46c26d10083
diff --git a/chromium/buildtools/mac/gn.sha1 b/chromium/buildtools/mac/gn.sha1
index 3aa55cd893e..9399e17f43c 100644
--- a/chromium/buildtools/mac/gn.sha1
+++ b/chromium/buildtools/mac/gn.sha1
@@ -1 +1 @@
-a14b089cbae9c29ecbc781686ada8babac8550af
+d8ff8eb053b2851486949550303e7ccae14c08df
diff --git a/chromium/buildtools/third_party/libc++abi/BUILD.gn b/chromium/buildtools/third_party/libc++abi/BUILD.gn
index a9580e7bde9..004c17d6277 100644
--- a/chromium/buildtools/third_party/libc++abi/BUILD.gn
+++ b/chromium/buildtools/third_party/libc++abi/BUILD.gn
@@ -45,7 +45,7 @@ source_set("libc++abi") {
 
   # This file should really be included on linux as well, but that
   # would introduce an unwanted glibc 2.18 dependency.
-  if (is_posix && !is_mac && !is_linux) {
+  if (is_fuchsia || (is_posix && !is_mac && !is_linux)) {
     sources += [ "trunk/src/cxa_thread_atexit.cpp" ]
   }
 
diff --git a/chromium/buildtools/win/gn.exe.sha1 b/chromium/buildtools/win/gn.exe.sha1
index 0ef132f1fbb..94d767a2dc8 100644
--- a/chromium/buildtools/win/gn.exe.sha1
+++ b/chromium/buildtools/win/gn.exe.sha1
@@ -1 +1 @@
-e93779cab57d5f36100faa4d88524a1e33be7b0f
+eb2806a49aa70d0af1c3d2b57fd2b496e37151a5