www-client/chromium: remove obsolete patches

41 files changed, 0 insertions, 1733 deletions

diff --git a/www-client/chromium/files/chromium-arm64-align-stack-16-bytes.patch b/www-client/chromium/files/chromium-arm64-align-stack-16-bytes.patch
deleted file mode 100644
index a962f79beac9..000000000000
--- a/www-client/chromium/files/chromium-arm64-align-stack-16-bytes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f352d974e43a73fed311c60c8fcb4dd043b16093 Mon Sep 17 00:00:00 2001
-From: "riku.voipio" <riku.voipio@linaro.org>
-Date: Wed, 27 Jan 2016 09:13:57 -0800
-Subject: [PATCH] sandbox arm64: align stack 16 bytes
-
-chrome fails to start with user namespace sandboxing:
-
-[866:866:0120/134742:FATAL:zygote_host_impl_linux.cc(182)] Check failed: process.IsValid().
-Failed to launch zygote process
-
-With strace..
-
-clone(child_stack=0x7ffd28fd98, flags=CLONE_NEWUSER|CLONE_NEWPID|CLONE_NEWNET|SIGCHLD) = -1 EINVAL (Invalid argument)
-
-Which compared to kernel sources[1], shows that stack needs to be 16
-bytes aligned. because stack grows downward, this patch assumes
-PTHREAD_STACK_MIN is dividable by 16 too.
-
-[1] http://lxr.free-electrons.com/source/arch/arm64/kernel/process.c#L267
-
-BUG=581018
-R=keescook@chromium.org,jln@chromium.org,rsesek@chromium.org,thakis@chromium.org
-TEST=base_unittests ProcessUtilTest.* and sandbox_linux_unittests NamespaceSandboxTest.*
-
-Review URL: https://codereview.chromium.org/1617763002
-
-Cr-Commit-Position: refs/heads/master@{#371809}
----
- base/process/launch_posix.cc          | 2 +-
- sandbox/linux/services/credentials.cc | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
-index 4bd3da3..4019de5 100644
---- a/base/process/launch_posix.cc
-+++ b/base/process/launch_posix.cc
-@@ -736,7 +736,7 @@ NOINLINE pid_t CloneAndLongjmpInChild(unsigned long flags,
-   // internal pid cache. The libc interface unfortunately requires
-   // specifying a new stack, so we use setjmp/longjmp to emulate
-   // fork-like behavior.
--  char stack_buf[PTHREAD_STACK_MIN];
-+  char stack_buf[PTHREAD_STACK_MIN] ALIGNAS(16);
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
-     defined(ARCH_CPU_MIPS64_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY)
-   // The stack grows downward.
-diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
-index fb6b6b4..76038af 100644
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -16,6 +16,7 @@
- #include <unistd.h>
- 
- #include "base/bind.h"
-+#include "base/compiler_specific.h"
- #include "base/files/file_path.h"
- #include "base/files/file_util.h"
- #include "base/logging.h"
-@@ -94,7 +95,7 @@ bool ChrootToSafeEmptyDir() {
-   // /proc/tid directory for the thread (since /proc may not be aware of the
-   // PID namespace). With a process, we can just use /proc/self.
-   pid_t pid = -1;
--  char stack_buf[PTHREAD_STACK_MIN];
-+  char stack_buf[PTHREAD_STACK_MIN] ALIGNAS(16);
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
-     defined(ARCH_CPU_MIPS64_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY)
-   // The stack grows downward.
--- 
-2.7.2
-
diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch
deleted file mode 100644
index c6c500732fa3..000000000000
--- a/www-client/chromium/files/chromium-cups-r0.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: printing/backend/print_backend.h
-diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
-index e03ef42e37cf0785ba735f4a241310f70125a6e7..a8123325a613f527ba4e91a412ba09cd3225c8ec 100644
---- a/printing/backend/print_backend.h
-+++ b/printing/backend/print_backend.h
-@@ -111,7 +111,6 @@ class PRINTING_EXPORT PrintBackend
- 
-   // Allocate a print backend. If |print_backend_settings| is NULL, default
-   // settings will be used.
--  // Return NULL if no print backend available.
-   static scoped_refptr<PrintBackend> CreateInstance(
-       const base::DictionaryValue* print_backend_settings);
- 
-Index: printing/backend/print_backend_dummy.cc
-diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
-index c73e5370720eda7a2f989401f37dc62c5e438e24..db269a75920d3c44381c87d67b91d923f0bfd8dc 100644
---- a/printing/backend/print_backend_dummy.cc
-+++ b/printing/backend/print_backend_dummy.cc
-@@ -13,10 +13,49 @@
- 
- namespace printing {
- 
-+class DummyPrintBackend : public PrintBackend {
-+ public:
-+  DummyPrintBackend() {
-+  }
-+
-+  bool EnumeratePrinters(PrinterList* printer_list) override {
-+    return false;
-+  }
-+
-+  std::string GetDefaultPrinterName() override {
-+    return std::string();
-+  }
-+
-+  bool GetPrinterSemanticCapsAndDefaults(
-+      const std::string& printer_name,
-+      PrinterSemanticCapsAndDefaults* printer_info) override {
-+    return false;
-+  }
-+
-+  bool GetPrinterCapsAndDefaults(
-+      const std::string& printer_name,
-+      PrinterCapsAndDefaults* printer_info) override {
-+    return false;
-+  }
-+
-+  std::string GetPrinterDriverInfo(
-+      const std::string& printer_name) override {
-+    return std::string();
-+  }
-+
-+  bool IsValidPrinter(const std::string& printer_name) override {
-+    return false;
-+  }
-+
-+ private:
-+  ~DummyPrintBackend() {}
-+
-+  DISALLOW_COPY_AND_ASSIGN(DummyPrintBackend);
-+};
-+
- scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
-     const base::DictionaryValue* print_backend_settings) {
--  NOTREACHED();
--  return NULL;
-+  return new DummyPrintBackend();
- }
- 
- }  // namespace printing
diff --git a/www-client/chromium/files/chromium-ffmpeg-generate_gn.patch b/www-client/chromium/files/chromium-ffmpeg-generate_gn.patch
deleted file mode 100644
index 799e3b2ac194..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-generate_gn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/593836
-
---- a/third_party/ffmpeg/chromium/scripts/generate_gn.py
-+++ b/third_party/ffmpeg/chromium/scripts/generate_gn.py
-@@ -662,8 +662,8 @@ RENAME_REGEX = re.compile('.*' + RENAME_PREFIX + '_.+');
- 
- # Content for the rename file. #includes the original file to ensure the two
- # files stay in sync.
--RENAME_CONTENT = """// File automatically generated. See crbug.com/495833.
--{0}include "{1}"
-+RENAME_CONTENT = """{0} File automatically generated. See crbug.com/495833.
-+{1}include "{2}"
- """
- 
- def GetIncludedSources(file_path, source_dir, include_set):
-@@ -827,9 +827,10 @@ def FixObjectBasenameCollisions(disjoint_sets, all_sources, do_rename_cb,
-       _, old_filename = os.path.split(rename.old_path)
-       _, file_extension = os.path.splitext(old_filename)
-       include_prefix = '%' if (file_extension == '.asm') else '#'
-+      comment_prefix = ';' if (file_extension == '.asm') else '//'
- 
-       do_rename_cb(rename.old_path, rename.new_path,
--                   RENAME_CONTENT.format(include_prefix, old_filename))
-+                   RENAME_CONTENT.format(comment_prefix, include_prefix, old_filename))
- 
-       source_set.sources.remove(rename.old_path)
-       source_set.sources.add(rename.new_path)
diff --git a/www-client/chromium/files/chromium-ffmpeg-license-r0.patch b/www-client/chromium/files/chromium-ffmpeg-license-r0.patch
deleted file mode 100644
index 8e44cbdbb0ac..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-license-r0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3c9d5afe45bf1c4656b8f630525433f29017cd08 Mon Sep 17 00:00:00 2001
-From: Chris Cunningham <chcunningham@chromium.org>
-Date: Tue, 21 Jun 2016 10:52:45 -0700
-Subject: [PATCH] Avoid ffmpeg licences/credits checking generated autorename_ files.
-
-We generated these renames as a fix for http://crbug.com/495833. The
-generated rename contains no license or credits info and should be
-skipped to avoid confusing license/credits scripts. Care must be
-taken to not also skip the underlying include file from upstream ffmpeg.
-
-Found by: Zoltan Kuscsik
-
-BUG=495833
-
-Change-Id: I3359f4de0281b5f057d4b109ab2a4f31895b5cb1
----
-
-diff --git a/chromium/scripts/generate_gyp.py b/chromium/scripts/generate_gyp.py
-index c3fd3c0..94c2aad 100755
---- a/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-+++ b/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-@@ -790,6 +790,9 @@
- # Prefix added to renamed files as part of
- RENAME_PREFIX = 'autorename'
- 
-+# Match an absolute path to a generated auotorename_ file.
-+RENAME_REGEX = re.compile('.*' + RENAME_PREFIX + '_.+');
-+
- # Content for the rename file. #includes the original file to ensure the two
- # files stay in sync.
- RENAME_CONTENT = """// File automatically generated. See crbug.com/495833.
-@@ -1020,6 +1023,12 @@
-     for source in source_set.sources:
-       GetIncludedSources(source, source_dir, sources_to_check)
- 
-+  # Remove autorename_ files now that we've grabbed their underlying includes.
-+  # We generated autorename_ files above and should not consider them for
-+  # licensing or credits.
-+  sources_to_check = filter(lambda s: not RENAME_REGEX.search(s),
-+                            sources_to_check)
-+
-   if not CheckLicensesForStaticLinking(sources_to_check, source_dir,
-                                        options.print_licenses):
-     exit('GENERATE FAILED: invalid licenses detected.')
diff --git a/www-client/chromium/files/chromium-gcc-4.7-r0.patch b/www-client/chromium/files/chromium-gcc-4.7-r0.patch
deleted file mode 100644
index 35e0bec4bbdf..000000000000
--- a/www-client/chromium/files/chromium-gcc-4.7-r0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mojo/public/c/system/macros.h.orig	2014-09-03 14:48:42.963665035 +0000
-+++ mojo/public/c/system/macros.h	2014-09-03 14:49:12.180255593 +0000
-@@ -76,7 +76,8 @@
- // Unlike the C++11 |alignas()|, |alignment| must be an integer. It may not be a
- // type, nor can it be an expression like |MOJO_ALIGNOF(type)| (due to the
- // non-C++11 MSVS version).
--#if __cplusplus >= 201103L
-+#if __cplusplus >= 201103L && \
-+	(defined(__clang__) || (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 >= 40800))
- #define MOJO_ALIGNAS(alignment) alignas(alignment)
- #elif defined(__GNUC__)
- #define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
diff --git a/www-client/chromium/files/chromium-gn-r0.patch b/www-client/chromium/files/chromium-gn-r0.patch
deleted file mode 100644
index 4ccfb93ba9a5..000000000000
--- a/www-client/chromium/files/chromium-gn-r0.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index ac8adc8..f198833 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -118,6 +118,19 @@ def build_gn_with_ninja_manually(tempdir, options):
-   root_gen_dir = os.path.join(tempdir, 'gen')
-   mkdir_p(root_gen_dir)
- 
-+  if is_linux:
-+    mkdir_p(os.path.join(root_gen_dir, 'base', 'allocator'))
-+    with tempfile.NamedTemporaryFile() as f:
-+      f.write('--flags USE_EXPERIMENTAL_ALLOCATOR_SHIM=true')
-+      f.flush()
-+
-+      check_call([
-+          os.path.join(SRC_ROOT, 'build', 'write_buildflag_header.py'),
-+          '--output', 'base/allocator/features.h',
-+          '--gen-dir', root_gen_dir,
-+          '--definitions', f.name,
-+      ])
-+
-   if is_mac:
-     # //base/build_time.cc needs base/generated_build_date.h,
-     # and this file is only included for Mac builds.
-@@ -155,13 +168,18 @@ def write_ninja(path, root_gen_dir, options):
-     else:
-       cflags.extend(['-O2', '-g0'])
- 
--    cflags.extend(['-D_FILE_OFFSET_BITS=64', '-pthread', '-pipe'])
-+    cflags.extend([
-+        '-D_FILE_OFFSET_BITS=64',
-+        '-pthread',
-+        '-pipe',
-+        '-fno-exceptions'
-+    ])
-     cflags_cc.extend(['-std=c++11', '-Wno-c++11-narrowing'])
- 
-   static_libraries = {
--      'base': {'sources': [], 'tool': 'cxx'},
--      'dynamic_annotations': {'sources': [], 'tool': 'cc'},
--      'gn': {'sources': [], 'tool': 'cxx'},
-+      'base': {'sources': [], 'tool': 'cxx', 'include_dirs': []},
-+      'dynamic_annotations': {'sources': [], 'tool': 'cc', 'include_dirs': []},
-+      'gn': {'sources': [], 'tool': 'cxx', 'include_dirs': []},
-   }
- 
-   for name in os.listdir(GN_ROOT):
-@@ -181,6 +199,7 @@ def write_ninja(path, root_gen_dir, options):
-   ])
-   static_libraries['base']['sources'].extend([
-       'base/allocator/allocator_extension.cc',
-+      'base/allocator/allocator_shim.cc',
-       'base/at_exit.cc',
-       'base/base_paths.cc',
-       'base/base_switches.cc',
-@@ -220,10 +239,11 @@ def write_ninja(path, root_gen_dir, options):
-       'base/metrics/bucket_ranges.cc',
-       'base/metrics/histogram.cc',
-       'base/metrics/histogram_base.cc',
--      'base/metrics/histogram_persistence.cc',
-       'base/metrics/histogram_samples.cc',
-       'base/metrics/metrics_hashes.cc',
-+      'base/metrics/persistent_histogram_allocator.cc',
-       'base/metrics/persistent_memory_allocator.cc',
-+      'base/metrics/persistent_sample_map.cc',
-       'base/metrics/sample_map.cc',
-       'base/metrics/sample_vector.cc',
-       'base/metrics/sparse_histogram.cc',
-@@ -276,6 +296,8 @@ def write_ninja(path, root_gen_dir, options):
-       'base/timer/timer.cc',
-       'base/trace_event/heap_profiler_allocation_context.cc',
-       'base/trace_event/heap_profiler_allocation_context_tracker.cc',
-+      'base/trace_event/heap_profiler_allocation_register.cc',
-+      'base/trace_event/heap_profiler_heap_dump_writer.cc',
-       'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
-       'base/trace_event/heap_profiler_type_name_deduplicator.cc',
-       'base/trace_event/memory_allocator_dump.cc',
-@@ -328,6 +350,7 @@ def write_ninja(path, root_gen_dir, options):
-         'base/threading/thread_local_storage_posix.cc',
-         'base/threading/worker_pool_posix.cc',
-         'base/time/time_posix.cc',
-+        'base/trace_event/heap_profiler_allocation_register_posix.cc',
-     ])
-     static_libraries['libevent'] = {
-         'sources': [
-@@ -362,6 +385,7 @@ def write_ninja(path, root_gen_dir, options):
-         'tool': 'cxx',
-     }
-     static_libraries['base']['sources'].extend([
-+        'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
-         'base/memory/shared_memory_posix.cc',
-         'base/nix/xdg_util.cc',
-         'base/process/internal_linux.cc',
diff --git a/www-client/chromium/files/chromium-gn-r1.patch b/www-client/chromium/files/chromium-gn-r1.patch
deleted file mode 100644
index d8929411cd5b..000000000000
--- a/www-client/chromium/files/chromium-gn-r1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 2262ab4a801745012ebe7da7ae15bafdf0bc2f79..3d996366f36ce052f57f2430dfe396dc5285cc59 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -291,6 +291,7 @@ def write_ninja(path, root_gen_dir, options):
-       'base/thread_task_runner_handle.cc',
-       'base/threading/non_thread_safe_impl.cc',
-       'base/threading/post_task_and_reply_impl.cc',
-+      'base/threading/sequenced_task_runner_handle.cc',
-       'base/threading/sequenced_worker_pool.cc',
-       'base/threading/simple_thread.cc',
-       'base/threading/thread.cc',
---- a/build/toolchain/gcc_toolchain.gni.orig	2016-05-06 10:44:53.493297905 +0000
-+++ b/build/toolchain/gcc_toolchain.gni	2016-05-06 10:46:27.391223437 +0000
-@@ -410,13 +410,6 @@
-       target_os = target_os
-       target_cpu = target_cpu
- 
--      forward_variables_from(invoker,
--                             [
--                               "use_allocator",
--                               "use_gold",
--                               "symbol_level",
--                             ])
--
-       if (defined(invoker.is_clang)) {
-         is_clang = invoker.is_clang
-       }
-@@ -426,6 +419,15 @@
-       if (defined(invoker.is_nacl_glibc)) {
-         is_nacl_glibc = invoker.is_nacl_glibc
-       }
-+      if (defined(invoker.symbol_level)) {
-+        symbol_level = invoker.symbol_level
-+      }
-+      if (defined(invoker.use_allocator)) {
-+        use_allocator = invoker.use_allocator
-+      }
-+      if (defined(invoker.use_gold)) {
-+        use_gold = invoker.use_gold
-+      }
- 
-       if (defined(invoker.clear_sanitizers) && invoker.clear_sanitizers) {
-         is_asan = false
diff --git a/www-client/chromium/files/chromium-gn-r2.patch b/www-client/chromium/files/chromium-gn-r2.patch
deleted file mode 100644
index e304829fa61e..000000000000
--- a/www-client/chromium/files/chromium-gn-r2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch by saiarcot895, https://codereview.chromium.org/2059803002
-
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 4648b540acbbba5666ea6a1c4b832e3706f7e642..72ffd6093d22dfa993f523ed425bcec8d3320b02 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -316,6 +316,7 @@ def write_ninja(path, root_gen_dir, options):
-       'base/trace_event/memory_dump_manager.cc',
-       'base/trace_event/memory_dump_request_args.cc',
-       'base/trace_event/memory_dump_session_state.cc',
-+      'base/trace_event/memory_infra_background_whitelist.cc',
-       'base/trace_event/process_memory_dump.cc',
-       'base/trace_event/process_memory_maps.cc',
-       'base/trace_event/process_memory_totals.cc',
-@@ -353,6 +354,7 @@ def write_ninja(path, root_gen_dir, options):
-         'base/process/process_posix.cc',
-         'base/synchronization/condition_variable_posix.cc',
-         'base/synchronization/lock_impl_posix.cc',
-+        'base/synchronization/read_write_lock_posix.cc',
-         'base/synchronization/waitable_event_posix.cc',
-         'base/sys_info_posix.cc',
-         'base/threading/platform_thread_internal_posix.cc',
diff --git a/www-client/chromium/files/chromium-gn-r3.patch b/www-client/chromium/files/chromium-gn-r3.patch
deleted file mode 100644
index b29a6aecbc40..000000000000
--- a/www-client/chromium/files/chromium-gn-r3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 9a3740e8..fa81d10 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -427,6 +427,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/profiler/scoped_tracker.cc',
-       'base/profiler/tracked_time.cc',
-       'base/run_loop.cc',
-+      'base/sequence_token.cc',
-       'base/sequence_checker_impl.cc',
-       'base/sequenced_task_runner.cc',
-       'base/sha1.cc',
-@@ -439,7 +440,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/strings/stringprintf.cc',
-       'base/strings/utf_string_conversion_utils.cc',
-       'base/strings/utf_string_conversions.cc',
--      'base/synchronization/cancellation_flag.cc',
-+      'base/synchronization/atomic_flag.cc',
-       'base/synchronization/lock.cc',
-       'base/sys_info.cc',
-       'base/task_runner.cc',
diff --git a/www-client/chromium/files/chromium-gn-r4.patch b/www-client/chromium/files/chromium-gn-r4.patch
deleted file mode 100644
index 53f208b419bf..000000000000
--- a/www-client/chromium/files/chromium-gn-r4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index fa81d10..aab92c2 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -373,6 +373,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/base_switches.cc',
-       'base/callback_internal.cc',
-       'base/command_line.cc',
-+      'base/debug/activity_tracker.cc',
-       'base/debug/alias.cc',
-       'base/debug/stack_trace.cc',
-       'base/debug/task_annotator.cc',
diff --git a/www-client/chromium/files/chromium-gn-r5.patch b/www-client/chromium/files/chromium-gn-r5.patch
deleted file mode 100644
index beb844fb6c81..000000000000
--- a/www-client/chromium/files/chromium-gn-r5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index aab92c243167769cb7ccbb2bd50672800ab43e3e..b07fd0a8eaf139e4d09e1641ce265353a3cd3ee5 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -445,6 +445,21 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/synchronization/lock.cc',
-       'base/sys_info.cc',
-       'base/task_runner.cc',
-+      'base/task_scheduler/delayed_task_manager.cc',
-+      'base/task_scheduler/post_task.cc',
-+      'base/task_scheduler/priority_queue.cc',
-+      'base/task_scheduler/scheduler_lock_impl.cc',
-+      'base/task_scheduler/scheduler_service_thread.cc',
-+      'base/task_scheduler/scheduler_worker.cc',
-+      'base/task_scheduler/scheduler_worker_pool_impl.cc',
-+      'base/task_scheduler/scheduler_worker_stack.cc',
-+      'base/task_scheduler/sequence.cc',
-+      'base/task_scheduler/sequence_sort_key.cc',
-+      'base/task_scheduler/task.cc',
-+      'base/task_scheduler/task_scheduler.cc',
-+      'base/task_scheduler/task_scheduler_impl.cc',
-+      'base/task_scheduler/task_tracker.cc',
-+      'base/task_scheduler/task_traits.cc',
-       'base/third_party/dmg_fp/dtoa_wrapper.cc',
-       'base/third_party/dmg_fp/g_fmt.cc',
-       'base/third_party/icu/icu_utf.cc',
diff --git a/www-client/chromium/files/chromium-gn-r6.patch b/www-client/chromium/files/chromium-gn-r6.patch
deleted file mode 100644
index 0273f4eb85ff..000000000000
--- a/www-client/chromium/files/chromium-gn-r6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index b07fd0a8eaf139e4d09e1641ce265353a3cd3ee5..e8304549335350915380731713643cd57ec70407 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -397,7 +397,6 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/location.cc',
-       'base/logging.cc',
-       'base/md5.cc',
--      'base/memory/ref_counted.cc',
-       'base/memory/ref_counted_memory.cc',
-       'base/memory/singleton.cc',
-       'base/memory/weak_ptr.cc',
diff --git a/www-client/chromium/files/chromium-gn-r7.patch b/www-client/chromium/files/chromium-gn-r7.patch
deleted file mode 100644
index dc57ccce7132..000000000000
--- a/www-client/chromium/files/chromium-gn-r7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index e8304549335350915380731713643cd57ec70407..b6a113d390d61db32736333c312f90124a44086c 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -379,6 +379,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/debug/task_annotator.cc',
-       'base/environment.cc',
-       'base/files/file.cc',
-+      'base/files/file_descriptor_watcher_posix.cc',
-       'base/files/file_enumerator.cc',
-       'base/files/file_path.cc',
-       'base/files/file_path_constants.cc',
-@@ -397,6 +398,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/location.cc',
-       'base/logging.cc',
-       'base/md5.cc',
-+      'base/memory/ref_counted.cc',
-       'base/memory/ref_counted_memory.cc',
-       'base/memory/singleton.cc',
-       'base/memory/weak_ptr.cc',
-@@ -685,7 +687,6 @@ def write_gn_ninja(path, root_gen_dir, options):
-         'base/timer/hi_res_timer_manager_win.cc',
-         'base/trace_event/heap_profiler_allocation_register_win.cc',
-         'base/trace_event/trace_event_etw_export_win.cc',
--        'base/trace_event/winheap_dump_provider_win.cc',
-         'base/win/enum_variant.cc',
-         'base/win/event_trace_controller.cc',
-         'base/win/event_trace_provider.cc',
diff --git a/www-client/chromium/files/chromium-gnome-r0.patch b/www-client/chromium/files/chromium-gnome-r0.patch
deleted file mode 100644
index 7a8c0a9a57bb..000000000000
--- a/www-client/chromium/files/chromium-gnome-r0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: ui/accessibility/platform/atk_util_auralinux.cc
-diff --git a/ui/accessibility/platform/atk_util_auralinux.cc b/ui/accessibility/platform/atk_util_auralinux.cc
-index a15df08137d874609305f90a6bca6e5c15e5c213..7fcaf219351289fe7eba1f670d7a6743a8b40ddc 100644
---- a/ui/accessibility/platform/atk_util_auralinux.cc
-+++ b/ui/accessibility/platform/atk_util_auralinux.cc
-@@ -3,7 +3,9 @@
- // found in the LICENSE file.
- 
- #include <atk/atk.h>
-+#if defined(USE_GCONF)
- #include <gconf/gconf-client.h>
-+#endif
- #include <glib-2.0/gmodule.h>
- 
- #include "base/files/file_path.h"
-@@ -14,6 +16,8 @@
- 
- namespace {
- 
-+#if defined(USE_GCONF)
-+
- const char kGnomeAccessibilityEnabledKey[] =
-     "/desktop/gnome/interface/accessibility";
- 
-@@ -39,6 +43,15 @@ bool ShouldEnableAccessibility() {
-   return value;
- }
- 
-+#else  // !defined(USE_GCONF)
-+
-+bool ShouldEnableAccessibility() {
-+  // TODO(k.czech): implement this for non-GNOME desktops.
-+  return false;
-+}
-+
-+#endif  // defined(USE_GCONF)
-+
- }  // namespace
- 
- G_BEGIN_DECLS
diff --git a/www-client/chromium/files/chromium-hotwording-2403.patch b/www-client/chromium/files/chromium-hotwording-2403.patch
deleted file mode 100644
index a3904ad03061..000000000000
--- a/www-client/chromium/files/chromium-hotwording-2403.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From c2a0c6df7d468da9864c56f2099aa947b07e2535 Mon Sep 17 00:00:00 2001
-From: amistry <amistry@chromium.org>
-Date: Tue, 9 Jun 2015 12:18:39 -0700
-Subject: [PATCH] Add build flag to disable hotwording.
-
-Hotwording downloads a shared module from the web store containing a NaCl module. There is a desire to build and distribute Chromium without this happening. This change adds an "enable_hotwording" build flag that is enabled by default, but can be disabled at compile time.
-
-BUG=491435
-
-Review URL: https://codereview.chromium.org/1160243004
-
-Cr-Commit-Position: refs/heads/master@{#333548}
-
-Conflicts:
-	chrome/browser/search/hotword_service.cc
----
- build/common.gypi                                 | 4 ++++
- chrome/browser/BUILD.gn                           | 9 +++++++++
- chrome/browser/search/hotword_service.cc          | 4 ++++
- chrome/browser/search/hotword_service_unittest.cc | 4 ++++
- chrome/chrome_browser.gypi                        | 3 +++
- 5 files changed, 24 insertions(+)
-
-diff --git a/build/common.gypi b/build/common.gypi
-index 339cc75..ddb075c 100644
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -381,6 +381,9 @@
-       # Web speech is enabled by default. Set to 0 to disable.
-       'enable_web_speech%': 1,
- 
-+      # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
-+      'enable_hotwording%': 1,
-+
-       # Notifications are compiled in by default. Set to 0 to disable.
-       'notifications%' : 1,
- 
-@@ -1134,6 +1137,7 @@
-     'configuration_policy%': '<(configuration_policy)',
-     'safe_browsing%': '<(safe_browsing)',
-     'enable_web_speech%': '<(enable_web_speech)',
-+    'enable_hotwording%': '<(enable_hotwording)',
-     'notifications%': '<(notifications)',
-     'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
-     'mac_want_real_dsym%': '<(mac_want_real_dsym)',
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 5152d83..6ccb079 100644
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -18,6 +18,11 @@ if (is_desktop_linux) {
-   import("//build/config/linux/pkg_config.gni")
- }
- 
-+declare_args() {
-+  # 'Ok Google' hotwording is enabled.
-+  enable_hotwording = true
-+}
-+
- about_credits_file = "$target_gen_dir/about_credits.html"
- additional_modules_list_file =
-     "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
-@@ -455,6 +460,10 @@ source_set("browser") {
-     }
-   }
- 
-+  if (enable_hotwording) {
-+    defines += [ "ENABLE_HOTWORDING" ]
-+  }
-+
-   if (is_linux) {
-     deps += [
-       "//device/media_transfer_protocol",
-diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
-index 0cf3c60..e93789b 100644
---- a/chrome/browser/search/hotword_service.cc
-+++ b/chrome/browser/search/hotword_service.cc
-@@ -642,6 +642,7 @@ bool HotwordService::IsServiceAvailable() {
- }
- 
- bool HotwordService::IsHotwordAllowed() {
-+#if defined(ENABLE_HOTWORDING)
-   std::string group = base::FieldTrialList::FindFullName(
-       hotword_internal::kHotwordFieldTrialName);
-   // Allow hotwording by default, and only disable if the field trial has been
-@@ -650,6 +651,9 @@ bool HotwordService::IsHotwordAllowed() {
-     return false;
- 
-   return DoesHotwordSupportLanguage(profile_);
-+#else
-+  return false;
-+#endif
- }
- 
- bool HotwordService::IsOptedIntoAudioLogging() {
-diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
-index a3aef47..b0b5927 100644
---- a/chrome/browser/search/hotword_service_unittest.cc
-+++ b/chrome/browser/search/hotword_service_unittest.cc
-@@ -216,6 +216,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) {
- }
- 
- TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
-+#if defined(ENABLE_HOTWORDING)
-   TestingProfile::Builder profile_builder;
-   scoped_ptr<TestingProfile> profile = profile_builder.Build();
- 
-@@ -246,6 +247,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
-   Profile* otr_profile = profile->GetOffTheRecordProfile();
-   SetApplicationLocale(otr_profile, "en");
-   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
-+#endif  // defined(ENABLE_HOTWORDING)
- }
- 
- TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
-@@ -302,6 +304,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
- }
- 
- TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
-+#if defined(ENABLE_HOTWORDING)
-   InitializeEmptyExtensionService();
-   service_->Init();
- 
-@@ -372,6 +375,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
-   EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
-   EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
-   EXPECT_EQ(1, hotword_service->uninstall_count());  // no change
-+#endif  // defined(ENABLE_HOTWORDING)
- }
- 
- TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
-diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
-index 6d323eb..1aaedba 100644
---- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -3529,6 +3529,9 @@
-         ['enable_session_service==1', {
-           'sources': [ '<@(chrome_browser_session_service_sources)' ],
-         }],
-+        ['enable_hotwording==1', {
-+          'defines': [ 'ENABLE_HOTWORDING' ],
-+        }],
-         ['OS!="android" and OS!="ios" and chromeos==0', {
-           'sources': [ '<@(chrome_browser_desktop_sources)' ],
-         }],
--- 
-2.4.4
-
diff --git a/www-client/chromium/files/chromium-last-commit-position-r0.patch b/www-client/chromium/files/chromium-last-commit-position-r0.patch
deleted file mode 100644
index 344ed4c7deb7..000000000000
--- a/www-client/chromium/files/chromium-last-commit-position-r0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tools/gn/gn_main.cc.orig	2015-11-12 11:49:56.260549036 +0000
-+++ tools/gn/gn_main.cc	2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
- 
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
- 
- namespace {
- 
---- tools/gn/BUILD.gn.orig	2015-11-12 11:50:43.513524769 +0000
-+++ tools/gn/BUILD.gn	2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
- 
-   deps = [
-     ":gn_lib",
--    ":last_commit_position",
-     "//base",
-     "//build/config/sanitizers:deps",
-   ]
diff --git a/www-client/chromium/files/chromium-last-commit-position-r1.patch b/www-client/chromium/files/chromium-last-commit-position-r1.patch
deleted file mode 100644
index 700a86e86b61..000000000000
--- a/www-client/chromium/files/chromium-last-commit-position-r1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/tools/gn/gn_main.cc.orig	2015-11-12 11:49:56.260549036 +0000
-+++ b/tools/gn/gn_main.cc	2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
- 
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
- 
- namespace {
- 
---- a/tools/gn/BUILD.gn.orig	2015-11-12 11:50:43.513524769 +0000
-+++ b/tools/gn/BUILD.gn	2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
- 
-   deps = [
-     ":gn_lib",
--    ":last_commit_position",
-     "//base",
-     "//build/config/sanitizers:deps",
-   ]
diff --git a/www-client/chromium/files/chromium-libsecret-r0.patch b/www-client/chromium/files/chromium-libsecret-r0.patch
deleted file mode 100644
index e55b0f725643..000000000000
--- a/www-client/chromium/files/chromium-libsecret-r0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
-index af7c775..e32fd13 100644
---- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -3246,6 +3246,9 @@
-           'defines': [
-             'USE_LIBSECRET',
-           ],
-+          'cflags': [
-+            '<!@(pkg-config --cflags libsecret-1)',
-+          ],
-         }],
-         ['use_aura==1', {
-           'sources': [ '<@(chrome_browser_aura_sources)' ],
diff --git a/www-client/chromium/files/chromium-linker-warnings-r0.patch b/www-client/chromium/files/chromium-linker-warnings-r0.patch
deleted file mode 100644
index 97d5e1670bdb..000000000000
--- a/www-client/chromium/files/chromium-linker-warnings-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- build/config/compiler/BUILD.gn.orig	2016-05-30 13:50:15.341749039 +0000
-+++ build/config/compiler/BUILD.gn	2016-05-30 13:50:30.502061407 +0000
-@@ -203,15 +203,6 @@
-         cflags += [ "-fstack-protector" ]
-       }
-     }
--
--    # Linker warnings.
--    if (!(is_chromeos && current_cpu == "arm") &&
--        !(is_android && use_order_profiling) && !is_mac && !is_ios) {
--      # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
--      # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
--      # crbug.com/485542
--      ldflags += [ "-Wl,--fatal-warnings" ]
--    }
-   }
- 
-   if (is_clang && is_debug) {
diff --git a/www-client/chromium/files/chromium-pdfium-r0.patch b/www-client/chromium/files/chromium-pdfium-r0.patch
deleted file mode 100644
index 2ba268467ef8..000000000000
--- a/www-client/chromium/files/chromium-pdfium-r0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- third_party/pdfium/xfa/fxbarcode/utils.h.orig	2016-05-30 10:24:54.071773744 +0000
-+++ third_party/pdfium/xfa/fxbarcode/utils.h	2016-05-30 10:25:15.808219373 +0000
-@@ -26,12 +26,10 @@
- #endif
- #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
- #define FXSYS_isnan(x) _isnan(x)
--#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_)
-+#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \
-+      _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_)
- #include <cmath>
- #define FXSYS_isnan(x) std::isnan(x)
--#elif(_FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_)
--#include <math.h>
--#define FXSYS_isnan(x) isnan(x)
- #endif
- #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
- #define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN())
diff --git a/www-client/chromium/files/chromium-rpath-r0.patch b/www-client/chromium/files/chromium-rpath-r0.patch
deleted file mode 100644
index 244e012048a4..000000000000
--- a/www-client/chromium/files/chromium-rpath-r0.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: base/BUILD.gn
-diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 9e4270d26009f853e37dc7af883bed4cb43705c8..7d67f62a688b0214bd3eb95a3cd4612bdd273b6d 100644
---- a/base/BUILD.gn
-+++ b/base/BUILD.gn
-@@ -1562,11 +1562,18 @@ test("base_unittests") {
-   if (is_linux) {
-     sources -= [ "file_version_info_unittest.cc" ]
-     sources += [ "nix/xdg_util_unittest.cc" ]
-+
-     deps += [ "//base/test:malloc_wrapper" ]
- 
-     if (use_glib) {
-       configs += [ "//build/config/linux:glib" ]
-     }
-+
-+    if (!is_component_build) {
-+      # Set rpath so that we find libmalloc_wrapper.so
-+      # even in a non-component build.
-+      configs += [ "//build/config/gcc:rpath_link" ]
-+    }
-   }
- 
-   if (!is_linux || use_ozone) {
-Index: build/config/gcc/BUILD.gn
-diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn
-index b6ab1d4b96ba7ba9a39409006f949569551f92d2..9bc16d9e0d918096cec7124ccf20f145643824b8 100644
---- a/build/config/gcc/BUILD.gn
-+++ b/build/config/gcc/BUILD.gn
-@@ -20,14 +20,8 @@ config("symbol_visibility_hidden") {
-   cflags = [ "-fvisibility=hidden" ]
- }
- 
--# Settings for executables and shared libraries.
--config("executable_ldconfig") {
--  if (is_android) {
--    ldflags = [
--      "-Bdynamic",
--      "-Wl,-z,nocopyreloc",
--    ]
--  } else {
-+config("rpath_link") {
-+  if (!is_android) {
-     # Note: Android doesn't support rpath.
-     rpath_link = ""
-     if (shlib_subdir != ".") {
-@@ -37,7 +31,25 @@ config("executable_ldconfig") {
-       # Want to pass "\$". GN will re-escape as required for ninja.
-       "-Wl,-rpath=\$ORIGIN/${rpath_link}",
-       "-Wl,-rpath-link=${rpath_link}",
-+    ]
-+  }
-+}
- 
-+# Settings for executables and shared libraries.
-+config("executable_ldconfig") {
-+  if (is_android) {
-+    ldflags = [
-+      "-Bdynamic",
-+      "-Wl,-z,nocopyreloc",
-+    ]
-+  } else {
-+    if (is_component_build) {
-+      configs += [ ":rpath_link" ]
-+    }
-+
-+    ldflags = [
-+      # TODO(GYP): Do we need a check on the binutils version here?
-+      #
-       # Newer binutils don't set DT_RPATH unless you disable "new" dtags
-       # and the new DT_RUNPATH doesn't work without --no-as-needed flag.
-       "-Wl,--disable-new-dtags",
diff --git a/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch b/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch
deleted file mode 100644
index 629ef808938f..000000000000
--- a/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- v8/snapshot_toolchain.gni.orig	2015-11-12 15:24:59.332391956 +0000
-+++ v8/snapshot_toolchain.gni	2015-11-12 15:25:23.280889700 +0000
-@@ -28,19 +28,4 @@
- # The snapshot needs to be compiled for the host, but compiled with
- # a toolchain that matches the bit-width of the target.
- 
--# TODO(GYP): For now we only support 32-bit little-endian target builds from an
--# x64 Linux host. Eventually we need to support all of the host/target
--# configurations v8 runs on.
--if (host_cpu == "x64" && host_os == "linux") {
--  if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
--    snapshot_toolchain = "//build/toolchain/linux:clang_x86"
--  } else if (target_cpu == "x64") {
--    snapshot_toolchain = "//build/toolchain/linux:clang_x64"
--  } else {
--    assert(false, "Need environment for this arch")
--  }
--} else {
--  snapshot_toolchain = default_toolchain
--}
--
--
-+snapshot_toolchain = default_toolchain
diff --git a/www-client/chromium/files/chromium-snapshot-toolchain-r1.patch b/www-client/chromium/files/chromium-snapshot-toolchain-r1.patch
deleted file mode 100644
index 56f35b303077..000000000000
--- a/www-client/chromium/files/chromium-snapshot-toolchain-r1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- v8/snapshot_toolchain.gni.orig	2016-01-07 15:47:46.772435180 +0000
-+++ v8/snapshot_toolchain.gni	2016-01-07 15:48:06.144841801 +0000
-@@ -28,19 +28,4 @@
- # The snapshot needs to be compiled for the host, but compiled with
- # a toolchain that matches the bit-width of the target.
- 
--# TODO(GYP): For now we only support 32-bit little-endian target builds from an
--# x64 Linux host. Eventually we need to support all of the host/target
--# configurations v8 runs on.
--if (host_cpu == "x64" && host_os == "linux") {
--  if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
--    snapshot_toolchain = "//build/toolchain/linux:clang_x86"
--  } else if (target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "mips64el") {
--    snapshot_toolchain = "//build/toolchain/linux:clang_x64"
--  } else {
--    assert(false, "Need environment for this arch: $target_cpu")
--  }
--} else {
--  snapshot_toolchain = default_toolchain
--}
--
--
-+snapshot_toolchain = default_toolchain
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch b/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
deleted file mode 100644
index 667e0ecb2a72..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index 677bd76..23a21f8 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -19,20 +19,12 @@
- 
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings.  This
--// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
--// file or the headers below will generate different structures.
--#define FF_API_PIX_FMT_DESC 0
--#define FF_API_OLD_DECODE_AUDIO 0
--#define FF_API_DESTRUCT_PACKET 0
--#define FF_API_GET_BUFFER 0
- 
- // Temporarily disable possible loss of data warning.
- // TODO(scherkus): fix and upstream the compiler warnings.
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
-   // If no estimate is found, the stream entry will be kInfiniteDuration().
-   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration());
--  const AVFormatInternal* internal = format_context->internal;
--  if (internal && internal->packet_buffer &&
--      format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
--    struct AVPacketList* packet_buffer = internal->packet_buffer;
--    while (packet_buffer != internal->packet_buffer_end) {
--      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
--                start_time_estimates.size());
--      const AVStream* stream =
--          format_context->streams[packet_buffer->pkt.stream_index];
--      if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
--        const base::TimeDelta packet_pts =
--            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
--        if (packet_pts < start_time_estimates[stream->index])
--          start_time_estimates[stream->index] = packet_pts;
--      }
--      packet_buffer = packet_buffer->next;
--    }
--  }
- 
-   AVStream* audio_stream = NULL;
-   AudioDecoderConfig audio_config;
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch b/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
deleted file mode 100644
index c9f6ce053b60..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:01:56.155462264 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:03:03.348846300 +0000
-@@ -19,10 +19,6 @@
- 
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings.  This
--// list of defines must mirror those in the 'defines' section of BUILD.gn file &
--// ffmpeg.gyp file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -36,7 +32,6 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
-   // If no estimate is found, the stream entry will be kInfiniteDuration().
-   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration());
--  const AVFormatInternal* internal = format_context->internal;
--  if (internal && internal->packet_buffer &&
--      format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
--    struct AVPacketList* packet_buffer = internal->packet_buffer;
--    while (packet_buffer != internal->packet_buffer_end) {
--      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
--                start_time_estimates.size());
--      const AVStream* stream =
--          format_context->streams[packet_buffer->pkt.stream_index];
--      if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
--        const base::TimeDelta packet_pts =
--            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
--        if (packet_pts < start_time_estimates[stream->index])
--          start_time_estimates[stream->index] = packet_pts;
--      }
--      packet_buffer = packet_buffer->next;
--    }
--  }
- 
-   AVStream* audio_stream = NULL;
-   AudioDecoderConfig audio_config;
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r2.patch b/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
deleted file mode 100644
index 8d67ef3898df..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:01:56.155462264 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h	2015-11-27 12:03:03.348846300 +0000
-@@ -19,10 +19,6 @@
- 
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings.  This
--// list of defines must mirror those in the 'defines' section of BUILD.gn file &
--// ffmpeg.gyp file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -36,7 +32,6 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1034,24 +1034,6 @@
-   // If no estimate is found, the stream entry will be kInfiniteDuration().
-   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration());
--  const AVFormatInternal* internal = format_context->internal;
--  if (internal && internal->packet_buffer &&
--      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--    struct AVPacketList* packet_buffer = internal->packet_buffer;
--    while (packet_buffer != internal->packet_buffer_end) {
--      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
--                start_time_estimates.size());
--      const AVStream* stream =
--          format_context->streams[packet_buffer->pkt.stream_index];
--      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--        const base::TimeDelta packet_pts =
--            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
--        if (packet_pts < start_time_estimates[stream->index])
--          start_time_estimates[stream->index] = packet_pts;
--      }
--      packet_buffer = packet_buffer->next;
--    }
--  }
- 
-   AVStream* audio_stream = NULL;
-   AudioDecoderConfig audio_config;
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
deleted file mode 100644
index e1e2135d2a2a..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill/core/common/autofill_l10n_util.cc.orig	2015-12-07 11:46:37.738740329 +0000
-+++ components/autofill/core/common/autofill_l10n_util.cc	2015-12-07 11:46:44.574878953 +0000
-@@ -22,7 +22,7 @@
-     // library. This could be due to a device-specific issue (has been seen in
-     // the wild on Android devices). In the failure case, |collator_| will be
-     // null. See http://crbug.com/558625.
--    icu_54::UnicodeString name;
-+    icu::UnicodeString name;
-     std::string locale_name;
-     locale.getDisplayName(name).toUTF8String(locale_name);
-     LOG(ERROR) << "Failed to initialize the ICU Collator for "
diff --git a/www-client/chromium/files/chromium-system-jinja-r10.patch b/www-client/chromium/files/chromium-system-jinja-r10.patch
deleted file mode 100644
index ee00b60d7beb..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r10.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig	2016-03-23 15:10:41.522637837 +0000
-+++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp	2016-03-23 15:10:56.938953740 +0000
-@@ -6,9 +6,6 @@
-   'variables': {
-     'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
-     'jinja_module_files': [
--      # jinja2/__init__.py contains version string, so sufficient for package
--      '<(DEPTH)/third_party/jinja2/__init__.py',
--      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-   },
- 
---- third_party/WebKit/Source/build/scripts/scripts.gni.orig	2016-06-02 09:54:28.510152077 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gni	2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
- 
- scripts_for_in_files = [
--  # jinja2/__init__.py contains version string, so sufficient as
--  # dependency for whole jinja2 package
--  "//third_party/jinja2/__init__.py",
--  "//third_party/markupsafe/__init__.py",  # jinja2 dep
-   "$_scripts_dir/hasher.py",
-   "$_scripts_dir/in_file.py",
-   "$_scripts_dir/in_generator.py",
---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig	2016-06-02 10:03:01.100658943 +0000
-+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn	2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
-   script = "code_generator_v8.py"
- 
--  inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+  inputs = [ "code_generator_v8.py" ] +
-            code_generator_template_files
- 
-   # Dummy file to track dependency.
---- third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig	2016-06-03 12:31:49.844954196 +0000
-+++ third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp	2016-06-03 12:32:01.869198425 +0000
-@@ -60,7 +60,6 @@
-         {
-           'action_name': 'generateV8InspectorProtocolBackendSources',
-           'inputs': [
--            '<@(jinja_module_files)',
-             # The python script in action below.
-             '../inspector_protocol/CodeGenerator.py',
-             # Input files for the script.
---- third_party/WebKit/Source/core/inspector/inspector.gyp.orig	2016-06-03 12:38:20.712891692 +0000
-+++ third_party/WebKit/Source/core/inspector/inspector.gyp	2016-06-03 12:38:31.197104557 +0000
-@@ -52,7 +52,6 @@
-         {
-           'action_name': 'generateInspectorProtocolBackendSources',
-           'inputs': [
--            '<@(jinja_module_files)',
-             # The python script in action below.
-             '../../platform/inspector_protocol/CodeGenerator.py',
-             # Input files for the script.
diff --git a/www-client/chromium/files/chromium-system-jinja-r11.patch b/www-client/chromium/files/chromium-system-jinja-r11.patch
deleted file mode 100644
index 0b3c9b72478b..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r11.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/build/scripts/scripts.gni.orig	2016-06-02 09:54:28.510152077 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gni	2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
- 
- scripts_for_in_files = [
--  # jinja2/__init__.py contains version string, so sufficient as
--  # dependency for whole jinja2 package
--  "//third_party/jinja2/__init__.py",
--  "//third_party/markupsafe/__init__.py",  # jinja2 dep
-   "$_scripts_dir/hasher.py",
-   "$_scripts_dir/in_file.py",
-   "$_scripts_dir/in_generator.py",
---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig	2016-06-02 10:03:01.100658943 +0000
-+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn	2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
-   script = "code_generator_v8.py"
- 
--  inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+  inputs = [ "code_generator_v8.py" ] +
-            code_generator_template_files
- 
-   # Dummy file to track dependency.
---- third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig	2016-06-03 12:31:49.844954196 +0000
-+++ third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp	2016-06-03 12:32:01.869198425 +0000
-@@ -60,7 +60,6 @@
-         {
-           'action_name': 'generateV8InspectorProtocolBackendSources',
-           'inputs': [
--            '<@(jinja_module_files)',
-             # The python script in action below.
-             '../inspector_protocol/CodeGenerator.py',
-             # Input files for the script.
---- third_party/WebKit/Source/core/inspector/inspector.gyp.orig	2016-06-03 12:38:20.712891692 +0000
-+++ third_party/WebKit/Source/core/inspector/inspector.gyp	2016-06-03 12:38:31.197104557 +0000
-@@ -52,7 +52,6 @@
-         {
-           'action_name': 'generateInspectorProtocolBackendSources',
-           'inputs': [
--            '<@(jinja_module_files)',
-             # The python script in action below.
-             '../../platform/inspector_protocol/CodeGenerator.py',
-             # Input files for the script.
diff --git a/www-client/chromium/files/chromium-system-jinja-r12.patch b/www-client/chromium/files/chromium-system-jinja-r12.patch
deleted file mode 100644
index 869cef9a36b3..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r12.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
---- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig	2016-06-02 09:54:28.510152077 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gni	2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
- 
- scripts_for_in_files = [
--  # jinja2/__init__.py contains version string, so sufficient as
--  # dependency for whole jinja2 package
--  "//third_party/jinja2/__init__.py",
--  "//third_party/markupsafe/__init__.py",  # jinja2 dep
-   "$_scripts_dir/hasher.py",
-   "$_scripts_dir/in_file.py",
-   "$_scripts_dir/in_generator.py",
---- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig	2016-06-02 10:03:01.100658943 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn	2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
-   script = "code_generator_v8.py"
- 
--  inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+  inputs = [ "code_generator_v8.py" ] +
-            code_generator_template_files
- 
-   # Dummy file to track dependency.
---- a/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig	2016-06-03 12:31:49.844954196 +0000
-+++ b/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp	2016-06-03 12:32:01.869198425 +0000
-@@ -60,7 +60,6 @@
-         {
-           'action_name': 'generateV8InspectorProtocolBackendSources',
-           'inputs': [
--            '<@(jinja_module_files)',
-             # The python script in action below.
-             '../inspector_protocol/CodeGenerator.py',
-             # Input files for the script.
---- a/third_party/WebKit/Source/core/inspector/inspector.gyp.orig	2016-06-03 12:38:20.712891692 +0000
-+++ b/third_party/WebKit/Source/core/inspector/inspector.gyp	2016-06-03 12:38:31.197104557 +0000
-@@ -52,7 +52,6 @@
-         {
-           'action_name': 'generateInspectorProtocolBackendSources',
-           'inputs': [
--            '<@(jinja_module_files)',
-             # The python script in action below.
-             '../../platform/inspector_protocol/CodeGenerator.py',
-             # Input files for the script.
diff --git a/www-client/chromium/files/chromium-system-jinja-r6.patch b/www-client/chromium/files/chromium-system-jinja-r6.patch
deleted file mode 100644
index 6a3ae46b7697..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r6.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- third_party/WebKit/Source/bindings/core/v8/generated.gyp.orig	2014-08-19 10:15:53.874850750 +0000
-+++ third_party/WebKit/Source/bindings/core/v8/generated.gyp	2014-08-19 10:16:04.163050746 +0000
-@@ -80,7 +80,6 @@
-       # Update that regex if command line changes (other than changing flags)
-       'action': [
-         'python',
--        '-S',  # skip 'import site' to speed up startup
-         '<(bindings_scripts_dir)/idl_compiler.py',
-         '--cache-dir',
-         '<(bindings_scripts_output_dir)',
---- third_party/WebKit/Source/bindings/modules/v8/generated.gyp.orig	2014-08-19 10:17:07.340279760 +0000
-+++ third_party/WebKit/Source/bindings/modules/v8/generated.gyp	2014-08-19 10:17:13.556400768 +0000
-@@ -68,7 +68,6 @@
-       # Update that regex if command line changes (other than changing flags)
-       'action': [
-         'python',
--        '-S',  # skip 'import site' to speed up startup
-         '<(bindings_scripts_dir)/idl_compiler.py',
-         '--cache-dir',
-         '<(bindings_scripts_output_dir)',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r7.patch b/www-client/chromium/files/chromium-system-jinja-r7.patch
deleted file mode 100644
index fe28e12c333c..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r8.patch b/www-client/chromium/files/chromium-system-jinja-r8.patch
deleted file mode 100644
index e1576ae77d6a..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r8.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig	2016-03-23 15:10:41.522637837 +0000
-+++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp	2016-03-23 15:10:56.938953740 +0000
-@@ -6,9 +6,6 @@
-   'variables': {
-     'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
-     'jinja_module_files': [
--      # jinja2/__init__.py contains version string, so sufficient for package
--      '<(DEPTH)/third_party/jinja2/__init__.py',
--      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-   },
- 
diff --git a/www-client/chromium/files/chromium-system-jinja-r9.patch b/www-client/chromium/files/chromium-system-jinja-r9.patch
deleted file mode 100644
index 1de9083f307c..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r9.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
--        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig	2016-03-23 15:10:41.522637837 +0000
-+++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp	2016-03-23 15:10:56.938953740 +0000
-@@ -6,9 +6,6 @@
-   'variables': {
-     'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
-     'jinja_module_files': [
--      # jinja2/__init__.py contains version string, so sufficient for package
--      '<(DEPTH)/third_party/jinja2/__init__.py',
--      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-   },
- 
---- third_party/WebKit/Source/build/scripts/scripts.gni.orig	2016-06-02 09:54:28.510152077 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gni	2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
- 
- scripts_for_in_files = [
--  # jinja2/__init__.py contains version string, so sufficient as
--  # dependency for whole jinja2 package
--  "//third_party/jinja2/__init__.py",
--  "//third_party/markupsafe/__init__.py",  # jinja2 dep
-   "$_scripts_dir/hasher.py",
-   "$_scripts_dir/in_file.py",
-   "$_scripts_dir/in_generator.py",
---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig	2016-06-02 10:03:01.100658943 +0000
-+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn	2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
-   script = "code_generator_v8.py"
- 
--  inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+  inputs = [ "code_generator_v8.py" ] +
-            code_generator_template_files
- 
-   # Dummy file to track dependency.
diff --git a/www-client/chromium/files/chromium-system-libvpx-r0.patch b/www-client/chromium/files/chromium-system-libvpx-r0.patch
deleted file mode 100644
index d9a3425508e2..000000000000
--- a/www-client/chromium/files/chromium-system-libvpx-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/linux/unbundle/libvpx.gyp.orig	2015-04-08 09:25:29.605925761 +0000
-+++ build/linux/unbundle/libvpx.gyp	2015-04-08 09:27:19.932142216 +0000
-@@ -24,6 +24,7 @@
-           'vpx/vpx_integer.h',
-           'vpx/vp8dx.h',
-           'vpx/vpx_encoder.h',
-+          'vpx/vpx_frame_buffer.h',
-         ],
-       },
-       'includes': [
diff --git a/www-client/chromium/files/chromium-system-zlib-r0.patch b/www-client/chromium/files/chromium-system-zlib-r0.patch
deleted file mode 100644
index 3bf38e5904fa..000000000000
--- a/www-client/chromium/files/chromium-system-zlib-r0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build/linux/unbundle/zlib.gn.orig	2016-05-30 13:09:56.987716771 +0000
-+++ build/linux/unbundle/zlib.gn	2016-05-30 13:12:36.879014187 +0000
-@@ -9,11 +9,16 @@
-   headers = [ "zlib.h" ]
- }
- 
-+config("system_zlib") {
-+  defines = [ "USE_SYSTEM_ZLIB=1" ]
-+}
-+
- source_set("zlib") {
-   deps = [
-     ":zlib_shim",
-   ]
-   libs = [ "z" ]
-+  public_configs = [ ":system_zlib" ]
- }
- 
- shim_headers("minizip_shim") {
diff --git a/www-client/chromium/files/chromium-system-zlib-r1.patch b/www-client/chromium/files/chromium-system-zlib-r1.patch
deleted file mode 100644
index c6a6c4083276..000000000000
--- a/www-client/chromium/files/chromium-system-zlib-r1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/extensions/browser/api/cast_channel/BUILD.gn.orig	2016-09-23 21:35:47.685867065 +0000
-+++ b/extensions/browser/api/cast_channel/BUILD.gn	2016-09-23 21:36:29.986723126 +0000
-@@ -27,5 +27,6 @@
-   deps = [
-     "//extensions/common/api",
-     "//extensions/common/api/cast_channel:cast_channel_proto",
-+    "//third_party/zlib",
-   ]
- }
diff --git a/www-client/chromium/files/chromium-tracing-r0.patch b/www-client/chromium/files/chromium-tracing-r0.patch
deleted file mode 100644
index 73121164077f..000000000000
--- a/www-client/chromium/files/chromium-tracing-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/trace-viewer/tracing/build/generate_about_tracing_contents.orig	2015-09-08 13:14:21.048113295 +0000
-+++ third_party/trace-viewer/tracing/build/generate_about_tracing_contents	2015-09-08 13:14:34.232384815 +0000
-@@ -8,6 +8,6 @@
- 
- if __name__ == '__main__':
-   top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
--  sys.path.append(top_dir)
-+  sys.path.insert(0, top_dir)
-   from tracing.build import generate_about_tracing_contents
-   sys.exit(generate_about_tracing_contents.main(sys.argv))
diff --git a/www-client/chromium/files/chromium-werror-r0.patch b/www-client/chromium/files/chromium-werror-r0.patch
deleted file mode 100644
index be0649b825e0..000000000000
--- a/www-client/chromium/files/chromium-werror-r0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: build/config/compiler/BUILD.gn
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 4d3c6ba0c09093bd5137cd32c4d37cdee1db6d40..71d9dc345f89f0f86e0e4e079f3124b682f558c1 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -22,6 +22,11 @@ if (is_win) {
- }
- 
- declare_args() {
-+  # Default to warnings as errors for default workflow, where we catch
-+  # warnings with known toolchains. Allow overriding this e.g. for Chromium
-+  # builds on Linux that could use a different version of the compiler.
-+  treat_warnings_as_errors = true
-+
-   # Normally, Android builds are lightly optimized, even for debug builds, to
-   # keep binary size down. Setting this flag to true disables such optimization
-   android_full_debug = false
-@@ -601,10 +606,11 @@ config("default_warnings") {
-   cflags_cc = []
- 
-   if (is_win) {
--    cflags += [
--      # Treat warnings as errors.
--      "/WX",
-+    if (treat_warnings_as_errors) {
-+      cflags += [ "/WX" ]
-+    }
- 
-+    cflags += [
-       # Warnings permanently disabled:
- 
-       # C4127: conditional expression is constant
-@@ -704,13 +710,16 @@ config("default_warnings") {
-     cflags += [
-       # Enables.
-       "-Wendif-labels",  # Weird old-style text after an #endif.
--      "-Werror",  # Warnings as errors.
- 
-       # Disables.
-       "-Wno-missing-field-initializers",  # "struct foo f = {0};"
-       "-Wno-unused-parameter",  # Unused function parameters.
-     ]
- 
-+    if (treat_warnings_as_errors) {
-+      cflags += [ "-Werror" ]
-+    }
-+
-     if (is_mac) {
-       cflags += [ "-Wnewline-eof" ]
-       if (!is_nacl) {
diff --git a/www-client/chromium/files/chromium-whitelist-arm64-syscalls.patch b/www-client/chromium/files/chromium-whitelist-arm64-syscalls.patch
deleted file mode 100644
index 125f77d0b018..000000000000
--- a/www-client/chromium/files/chromium-whitelist-arm64-syscalls.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 4e8083b4ab953ba298aedfc4e79d464be15e4012 Mon Sep 17 00:00:00 2001
-From: "riku.voipio" <riku.voipio@linaro.org>
-Date: Tue, 1 Mar 2016 08:02:43 -0800
-Subject: [PATCH] Linux Sandbox: whitelist arm64 syscalls
-
-On debian/arm64, two syscalls needed whitelisting for chromium to work with seccomp:
-
-epoll_pwait, replacing epoll_wait which is a legacy syscall not available on arm64. epoll_wait implmentation in glibc calls epoll_pwait behind scenes, so this needs to be enabled.
-
-getrlimit, missing #ifdef for arm64 in several policy definitions. test for arm64 added for each case.
-
-BUG=581018
-R=keescook@chromium.org,jln@chromium.org,rsesek@chromium.org
-TEST=Start chrome on arm64 with seccomp enabled kernel
-
-Review URL: https://codereview.chromium.org/1613883002
-
-Cr-Commit-Position: refs/heads/master@{#378440}
----
- components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc | 3 ++-
- content/common/sandbox_linux/bpf_renderer_policy_linux.cc      | 3 ++-
- content/common/sandbox_linux/bpf_utility_policy_linux.cc       | 3 ++-
- mojo/shell/runner/host/linux_sandbox.cc                        | 5 ++++-
- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc              | 2 +-
- 5 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
-index 66a606a..3e88304 100644
---- a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
-+++ b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
-@@ -106,7 +106,8 @@ ResultExpr NaClBPFSandboxPolicy::EvaluateSyscall(int sysno) const {
-     // NaCl uses custom signal stacks.
-     case __NR_sigaltstack:
-     // Below is fairly similar to the policy for a Chromium renderer.
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__aarch64__)
-     case __NR_getrlimit:
- #endif
- #if defined(__i386__) || defined(__arm__)
-diff --git a/content/common/sandbox_linux/bpf_renderer_policy_linux.cc b/content/common/sandbox_linux/bpf_renderer_policy_linux.cc
-index e799273..993e2a5 100644
---- a/content/common/sandbox_linux/bpf_renderer_policy_linux.cc
-+++ b/content/common/sandbox_linux/bpf_renderer_policy_linux.cc
-@@ -60,7 +60,8 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
-     // Allow the system calls below.
-     case __NR_fdatasync:
-     case __NR_fsync:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__aarch64__)
-     case __NR_getrlimit:
- #endif
- #if defined(__i386__) || defined(__arm__)
-diff --git a/content/common/sandbox_linux/bpf_utility_policy_linux.cc b/content/common/sandbox_linux/bpf_utility_policy_linux.cc
-index 3ead1c8..1336796 100644
---- a/content/common/sandbox_linux/bpf_utility_policy_linux.cc
-+++ b/content/common/sandbox_linux/bpf_utility_policy_linux.cc
-@@ -32,7 +32,8 @@ ResultExpr UtilityProcessPolicy::EvaluateSyscall(int sysno) const {
-     // Allow the system calls below.
-     case __NR_fdatasync:
-     case __NR_fsync:
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__aarch64__)
-     case __NR_getrlimit:
- #endif
- #if defined(__i386__) || defined(__arm__)
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 10278dc..b30b3e6 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -414,6 +414,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) {
-     case __NR_epoll_create:
-     case __NR_epoll_wait:
- #endif
-+    case __NR_epoll_pwait:
-     case __NR_epoll_create1:
-     case __NR_epoll_ctl:
-       return true;
-@@ -421,7 +422,6 @@ bool SyscallSets::IsAllowedEpoll(int sysno) {
- #if defined(__x86_64__)
-     case __NR_epoll_ctl_old:
- #endif
--    case __NR_epoll_pwait:
- #if defined(__x86_64__)
-     case __NR_epoll_wait_old:
- #endif
--- 
-2.7.2
-
diff --git a/www-client/chromium/files/chromium-widevine.patch b/www-client/chromium/files/chromium-widevine.patch
deleted file mode 100644
index 04e560e6f4a9..000000000000
--- a/www-client/chromium/files/chromium-widevine.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig	2014-12-10 05:36:13.000000000 +0100
-+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h	2014-12-28 20:47:39.080795240 +0100
-@@ -14,4 +14,8 @@
- //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
- //    as a string, e.g., "1.0.123.456").
- 
-+#include "third_party/widevine/cdm/widevine_cdm_common.h"
-+#define WIDEVINE_CDM_AVAILABLE
-+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
-+
- #endif  // WIDEVINE_CDM_VERSION_H_
---- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig	2014-12-10 05:54:35.000000000 +0100
-+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp	2014-12-28 20:50:48.163269989 +0100
-@@ -7,7 +7,7 @@
-     'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
-     'widevine_cdm_binary_files%': [],
-     'conditions': [
--      [ 'branding == "Chrome"', {
-+      [ 'branding == "Chromium"', {
-         'conditions': [
-           [ 'chromeos == 1', {
-             'widevine_cdm_version_h_file%':
-@@ -54,7 +54,7 @@
-       'target_name': 'widevinecdmadapter',
-       'type': 'none',
-       'conditions': [
--        [ 'branding == "Chrome" and enable_pepper_cdms==1', {
-+        [ 'branding == "Chromium" and enable_pepper_cdms==1', {
-           'dependencies': [
-             '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
-             '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',