update to 70.0.3538.77

www/chromium/Makefile

@@ -1,18 +1,14 @@
-# $OpenBSD: Makefile,v 1.393 2018/09/27 06:36:18 robert Exp $
+# $OpenBSD: Makefile,v 1.394 2018/11/04 12:33:24 robert Exp $
 
 .include <bsd.port.arch.mk>
 
 USE_WXNEEDED=		Yes
-.if ${ARCH} != i386
-USE_LLD=		Yes
-.endif
 
 DPB_PROPERTIES=		parallel parallel2
 
 COMMENT=		Chromium browser
 
-V=			69.0.3497.100
-REVISION=		0
+V=			70.0.3538.77
 
 DISTNAME=		chromium-${V}
 
@@ -62,10 +58,11 @@ WANTLIB += pangocairo-1.0
 WANTLIB += Xcomposite Xdamage
 WANTLIB += EGL Xau Xdmcp Xinerama Xxf86vm atspi cairo-gobject
 WANTLIB += drm epoxy fontconfig freetype fribidi gmodule-2.0 graphite2
-WANTLIB += gthread-2.0 harfbuzz intl pangoft2-1.0 pcre pixman-1
+WANTLIB += gthread-2.0 intl pangoft2-1.0 pcre pixman-1
 WANTLIB += plc4 plds4 png util xcb-dri2 xcb-glx xcb-render xcb-shm
 WANTLIB += xml2 z
 WANTLIB += uuid
+WANTLIB += harfbuzz 
 
 RUN_DEPENDS=	devel/xdg-utils \
 		devel/desktop-file-utils \
@@ -86,7 +83,8 @@ BUILD_DEPENDS=	archivers/bzip2 \
 		devel/ninja \
 		x11/gtk+3 \
 		${MODGCC4_CPPDEP}
-LIB_DEPENDS=	devel/libexecinfo \
+LIB_DEPENDS=	devel/harfbuzz \
+		devel/libexecinfo \
 		security/nss \
 		sysutils/e2fsprogs \
 		textproc/libxslt \
@@ -126,7 +124,6 @@ GN_ARGS=	enable_nacl=false \
 		use_kerberos=false \
 		use_sndio=true \
 		use_cups=true \
-		use_gtk3=true \
 		use_system_libdrm=true \
 		use_jumbo_build=true \
 		is_clang=true \

www/chromium/distinfo

@@ -1,2 +1,2 @@
-SHA256 (chromium-69.0.3497.100.tar.xz) = 4zkVYOc+JftK/D8t1WFmB+Lb/FiqiCUaLF1rcJb+njU=
-SIZE (chromium-69.0.3497.100.tar.xz) = 617374764
+SHA256 (chromium-70.0.3538.77.tar.xz) = yRT4bEyDdbcZ7KieqJ2+xK49Cd8/dY1ffJHUkU0pBEk=
+SIZE (chromium-70.0.3538.77.tar.xz) = 623083096

www/chromium/patches/patch-BUILD_gn

@@ -1,9 +1,9 @@
-$OpenBSD: patch-BUILD_gn,v 1.19 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-BUILD_gn,v 1.20 2018/11/04 12:33:24 robert Exp $
 
 Index: BUILD.gn
 --- BUILD.gn.orig
 +++ BUILD.gn
-@@ -354,7 +354,7 @@ group("gn_all") {
+@@ -355,7 +355,7 @@ group("gn_all") {
          [ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ]
    }
  
@@ -12,7 +12,7 @@ Index: BUILD.gn
      deps += [
        "//third_party/breakpad:breakpad_unittests",
        "//third_party/breakpad:core-2-minidump",
-@@ -396,8 +396,6 @@ group("gn_all") {
+@@ -397,8 +397,6 @@ group("gn_all") {
        "//net:disk_cache_memory_test",
        "//net:quic_client",
        "//net:quic_server",
@@ -21,7 +21,7 @@ Index: BUILD.gn
        "//testing:empty_main",
      ]
  
-@@ -454,10 +452,6 @@ group("gn_all") {
+@@ -455,10 +453,6 @@ group("gn_all") {
          "//chrome/test/chromedriver:chromedriver",
          "//chrome/test/chromedriver:chromedriver_tests",
          "//components/sync:run_sync_testserver",
@@ -43,7 +43,7 @@ Index: BUILD.gn
      ]
  
      if (!is_android) {
-@@ -593,7 +583,7 @@ group("gn_all") {
+@@ -592,7 +582,7 @@ group("gn_all") {
          host_os == "win") {
        deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
      }
@@ -52,7 +52,7 @@ Index: BUILD.gn
      deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
    }
  
-@@ -819,7 +809,6 @@ if (is_chromeos) {
+@@ -821,7 +811,6 @@ if (is_chromeos) {
        "//ppapi/examples/video_decode",
        "//sandbox/linux:chrome_sandbox",
        "//sandbox/linux:sandbox_linux_unittests",
@@ -60,7 +60,7 @@ Index: BUILD.gn
  
        # Blocked on https://github.com/catapult-project/catapult/issues/2297
        #"//third_party/catapult/telemetry:bitmaptools",
-@@ -942,7 +931,7 @@ if (!is_ios) {
+@@ -926,7 +915,7 @@ if (!is_ios) {
        ]
      }
  
@@ -69,7 +69,7 @@ Index: BUILD.gn
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -951,7 +940,7 @@ if (!is_ios) {
+@@ -935,7 +924,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -78,7 +78,7 @@ Index: BUILD.gn
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1076,9 +1065,6 @@ group("chromium_builder_perf") {
+@@ -1060,9 +1049,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

www/chromium/patches/patch-ash_display_mirror_window_controller_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.19 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.20 2018/11/04 12:33:24 robert Exp $
 Index: ash/display/mirror_window_controller.cc
 --- ash/display/mirror_window_controller.cc.orig
 +++ ash/display/mirror_window_controller.cc
-@@ -255,7 +255,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -253,7 +253,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;
                         }) == display_info_list.end()) {
          CloseAndDeleteHost(iter->second, true);

www/chromium/patches/patch-base_BUILD_gn

@@ -1,9 +1,9 @@
-$OpenBSD: patch-base_BUILD_gn,v 1.20 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-base_BUILD_gn,v 1.21 2018/11/04 12:33:24 robert Exp $
 
 Index: base/BUILD.gn
 --- base/BUILD.gn.orig
 +++ base/BUILD.gn
-@@ -1248,7 +1248,7 @@ jumbo_component("base") {
+@@ -1276,7 +1276,7 @@ jumbo_component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -12,7 +12,7 @@ Index: base/BUILD.gn
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
-@@ -1274,7 +1274,7 @@ jumbo_component("base") {
+@@ -1302,7 +1302,7 @@ jumbo_component("base") {
          "allocator/allocator_shim_override_glibc_weak_symbols.h",
        ]
        deps += [ "//base/allocator:tcmalloc" ]
@@ -21,7 +21,7 @@ Index: base/BUILD.gn
        sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
      } else if (is_android && use_allocator == "none") {
        sources += [
-@@ -1704,6 +1704,29 @@ jumbo_component("base") {
+@@ -1744,6 +1744,29 @@ jumbo_component("base") {
      }
    }
  
@@ -51,7 +51,7 @@ Index: base/BUILD.gn
    # iOS
    if (is_ios) {
      set_sources_assignment_filter([])
-@@ -2721,6 +2744,8 @@ test("base_unittests") {
+@@ -2781,6 +2804,8 @@ test("base_unittests") {
        # data += [ "$root_out_dir/base_unittests.dSYM/" ]
      }
    }

www/chromium/patches/patch-base_debug_debugger_posix_cc

@@ -1,7 +1,8 @@
-$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.20 2017/01/26 17:08:25 robert Exp $
---- base/debug/debugger_posix.cc.orig.port	Thu Dec 15 00:02:02 2016
-+++ base/debug/debugger_posix.cc	Tue Jan  3 20:29:54 2017
-@@ -34,6 +34,10 @@
+$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.21 2018/11/04 12:33:24 robert Exp $
+Index: base/debug/debugger_posix.cc
+--- base/debug/debugger_posix.cc.orig
++++ base/debug/debugger_posix.cc
+@@ -35,6 +35,10 @@
  #include <sys/sysctl.h>
  #endif
  
@@ -12,7 +13,7 @@ $OpenBSD: patch-base_debug_debugger_posix_cc,v 1.20 2017/01/26 17:08:25 robert E
  #if defined(OS_FREEBSD)
  #include <sys/user.h>
  #endif
-@@ -92,33 +96,38 @@ bool BeingDebugged() {
+@@ -93,33 +97,38 @@ bool BeingDebugged() {
  
    // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
    // binary interfaces may change.

www/chromium/patches/patch-base_debug_stack_trace_posix_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.29 2018/03/12 13:48:34 robert Exp $
+$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.30 2018/11/04 12:33:24 robert Exp $
 
 Index: base/debug/stack_trace_posix.cc
 --- base/debug/stack_trace_posix.cc.orig
@@ -12,7 +12,7 @@ Index: base/debug/stack_trace_posix.cc
  #include "base/debug/proc_maps_linux.h"
  #endif
  
-@@ -646,6 +646,10 @@ class SandboxSymbolizeHelper {
+@@ -647,6 +647,10 @@ class SandboxSymbolizeHelper {
    // for the modules that are loaded in the current process.
    // Returns true on success.
    bool CacheMemoryRegions() {
@@ -23,7 +23,7 @@ Index: base/debug/stack_trace_posix.cc
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -663,6 +667,7 @@ class SandboxSymbolizeHelper {
+@@ -664,6 +668,7 @@ class SandboxSymbolizeHelper {
  
      is_initialized_ = true;
      return true;
@@ -31,7 +31,7 @@ Index: base/debug/stack_trace_posix.cc
    }
  
    // Opens all object files and caches their file descriptors.
-@@ -800,7 +805,7 @@ StackTrace::StackTrace(size_t count) {
+@@ -806,7 +811,7 @@ StackTrace::StackTrace(size_t count) {
  // NOTE: This code MUST be async-signal safe (it's used by in-process
  // stack dumping signal handler). NO malloc or stdio is allowed here.
  

www/chromium/patches/patch-base_process_process_metrics_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_process_process_metrics_h,v 1.17 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-base_process_process_metrics_h,v 1.18 2018/11/04 12:33:24 robert Exp $
 
 Index: base/process/process_metrics.h
 --- base/process/process_metrics.h.orig
@@ -12,16 +12,16 @@ Index: base/process/process_metrics.h
  // Minor and major page fault counts since the process creation.
  // Both counts are process-wide, and exclude child processes.
  //
-@@ -177,7 +177,7 @@ class BASE_EXPORT ProcessMetrics {
-   // otherwise.
-   bool GetIOCounters(IoCounters* io_counters) const;
+@@ -189,7 +189,7 @@ class BASE_EXPORT ProcessMetrics {
+   // process since process start.
+   uint64_t GetCumulativeDiskUsageInBytes();
  
 -#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
 +#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD)
    // Returns the number of file descriptors currently open by the process, or
    // -1 on error.
    int GetOpenFdCount() const;
-@@ -187,7 +187,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -199,7 +199,7 @@ class BASE_EXPORT ProcessMetrics {
    int GetOpenFdSoftLimit() const;
  #endif  // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
  
@@ -30,7 +30,7 @@ Index: base/process/process_metrics.h
    // Bytes of swap as reported by /proc/[pid]/status.
    uint64_t GetVmSwapBytes() const;
  
-@@ -206,7 +206,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics {
    ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
  #endif  // !defined(OS_MACOSX) || defined(OS_IOS)
  
@@ -39,16 +39,16 @@ Index: base/process/process_metrics.h
    int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
  #endif
  #if defined(OS_MACOSX)
-@@ -229,7 +229,7 @@ class BASE_EXPORT ProcessMetrics {
-   TimeDelta last_cumulative_cpu_;
- #endif
+@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
+   // Number of bytes transferred to/from disk in bytes.
+   uint64_t last_cumulative_disk_usage_ = 0;
  
 -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
 +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
    // Same thing for idle wakeups.
    TimeTicks last_idle_wakeups_time_;
    uint64_t last_absolute_idle_wakeups_;
-@@ -275,7 +275,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
  #endif  // defined(OS_POSIX)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
@@ -57,7 +57,7 @@ Index: base/process/process_metrics.h
  // Data about system-wide memory consumption. Values are in KB. Available on
  // Windows, Mac, Linux, Android and Chrome OS.
  //
-@@ -308,7 +308,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
    int avail_phys = 0;
  #endif
  
@@ -66,7 +66,7 @@ Index: base/process/process_metrics.h
    // This provides an estimate of available memory as described here:
    // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
    // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
-@@ -323,7 +323,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
@@ -75,7 +75,7 @@ Index: base/process/process_metrics.h
    int buffers = 0;
    int cached = 0;
    int active_anon = 0;
-@@ -361,7 +361,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -379,7 +379,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
  #endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
          // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
  

www/chromium/patches/patch-base_process_process_posix_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-base_process_process_posix_cc,v 1.17 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-base_process_process_posix_cc,v 1.18 2018/11/04 12:33:24 robert Exp $
 
 Index: base/process/process_posix.cc
 --- base/process/process_posix.cc.orig
@@ -11,7 +11,7 @@ Index: base/process/process_posix.cc
  
  #include "base/debug/activity_tracker.h"
  #include "base/files/scoped_file.h"
-@@ -24,6 +25,9 @@
+@@ -25,6 +26,9 @@
  
  namespace {
  
@@ -21,7 +21,7 @@ Index: base/process/process_posix.cc
  #if !defined(OS_NACL_NONSFI)
  
  bool WaitpidWithTimeout(base::ProcessHandle handle,
-@@ -262,12 +266,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces
+@@ -263,12 +267,10 @@ Process Process::DeprecatedGetProcessFromHandle(Proces
    return Process(handle);
  }
  
@@ -35,7 +35,7 @@ Index: base/process/process_posix.cc
  
  // static
  void Process::TerminateCurrentProcessImmediately(int exit_code) {
-@@ -351,21 +353,23 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout
+@@ -355,21 +357,23 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout
  
  void Process::Exited(int exit_code) const {}
  

www/chromium/patches/patch-build_config_compiler_BUILD_gn

@@ -1,4 +1,4 @@
-$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.21 2018/09/12 19:10:34 robert Exp $
+$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.22 2018/11/04 12:33:24 robert Exp $
 
 Index: build/config/compiler/BUILD.gn
 --- build/config/compiler/BUILD.gn.orig
@@ -8,11 +8,11 @@ Index: build/config/compiler/BUILD.gn
    # you are using a custom toolchain and need to control -B in cflags.
    linux_use_bundled_binutils =
 -      linux_use_bundled_binutils_override && is_linux &&
-+      linux_use_bundled_binutils_override && (is_linux  && !is_openbsd) &&
++      linux_use_bundled_binutils_override && (is_linux && !is_openbsd) &&
        (current_cpu == "x64" || current_cpu == "x86")
    binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                                root_build_dir)
-@@ -263,7 +263,7 @@ config("compiler") {
+@@ -273,7 +273,7 @@ config("compiler") {
      # Linker warnings.
      if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
          !(is_android && use_order_profiling) && !is_mac && !is_ios &&
@@ -21,7 +21,7 @@ Index: build/config/compiler/BUILD.gn
        # 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
-@@ -327,7 +327,7 @@ config("compiler") {
+@@ -337,7 +337,7 @@ config("compiler") {
        }
      }
  
@@ -30,7 +30,7 @@ Index: build/config/compiler/BUILD.gn
        # Explicitly pass --build-id to ld. Compilers used to always pass this
        # implicitly but don't any more (in particular clang when built without
        # ENABLE_LINKER_BUILD_ID=ON). The crash infrastructure does need a build
-@@ -376,16 +376,11 @@ config("compiler") {
+@@ -386,19 +386,11 @@ config("compiler") {
      }
  
      ldflags += [
@@ -39,7 +39,10 @@ Index: build/config/compiler/BUILD.gn
        "-Wl,-z,now",
        "-Wl,-z,relro",
      ]
--    if (!using_sanitizer) {
+-
+-    # Compiler instrumentation can introduce dependencies in DSOs to symbols in
+-    # the executable they are loaded into, so they are unresolved at link-time.
+-    if (!using_sanitizer && !is_safestack) {
 -      ldflags += [
 -        "-Wl,-z,defs",
 -        "-Wl,--as-needed",
@@ -48,7 +51,7 @@ Index: build/config/compiler/BUILD.gn
    }
  
    # Linux-specific compiler flags setup.
-@@ -489,7 +484,7 @@ config("compiler") {
+@@ -502,7 +494,7 @@ config("compiler") {
    }
  
    if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
@@ -57,7 +60,7 @@ Index: build/config/compiler/BUILD.gn
      cflags += [
        # TODO(hans): Remove this once Clang generates better optimized debug info
        # by default. https://crbug.com/765793
-@@ -742,7 +737,7 @@ config("compiler_cpu_abi") {
+@@ -793,7 +785,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -66,7 +69,7 @@ Index: build/config/compiler/BUILD.gn
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1477,10 +1472,6 @@ config("default_warnings") {
+@@ -1511,10 +1503,6 @@ config("default_warnings") {
          cflags += [
            # TODO(thakis): https://crbug.com/753973
            "-Wno-enum-compare-switch",
@@ -77,7 +80,7 @@ Index: build/config/compiler/BUILD.gn
          ]
        }
      }
-@@ -1654,7 +1645,7 @@ config("thin_archive") {
+@@ -1701,7 +1689,7 @@ config("thin_archive") {
    # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
    # have a "thin archive" mode (it does accept -T, but it means truncating
    # archive names to 16 characters, which is not what we want).
@@ -86,7 +89,7 @@ Index: build/config/compiler/BUILD.gn
      arflags = [ "-T" ]
    }
  }
-@@ -2181,7 +2172,7 @@ config("symbols") {
+@@ -2228,7 +2216,7 @@ config("symbols") {
          # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f
          cflags += [ "-gdwarf-3" ]
        }

www/chromium/patches/patch-build_config_compiler_compiler_gni

@@ -1,9 +1,9 @@
-$OpenBSD: patch-build_config_compiler_compiler_gni,v 1.13 2018/07/30 15:28:28 robert Exp $
+$OpenBSD: patch-build_config_compiler_compiler_gni,v 1.14 2018/11/04 12:33:24 robert Exp $
 
 Index: build/config/compiler/compiler.gni
 --- build/config/compiler/compiler.gni.orig
 +++ build/config/compiler/compiler.gni
-@@ -163,7 +163,7 @@ declare_args() {
+@@ -166,7 +166,7 @@ declare_args() {
    # TODO(pcc): Enable lld on more architectures on Linux. E.g. we probably need
    # to fix some of crbug.com/742655 to enable it on ARM.
    use_lld =
@@ -12,7 +12,7 @@ Index: build/config/compiler/compiler.gni
        (is_win || is_fuchsia || (use_thin_lto && target_os != "chromeos") ||
         (is_linux && current_cpu == "x64" && target_os != "chromeos") ||
         (is_android && (current_cpu != "arm" || arm_version >= 7) &&
-@@ -172,7 +172,7 @@ declare_args() {
+@@ -175,7 +175,7 @@ declare_args() {
  
  declare_args() {
    # Whether to use the gold linker from binutils instead of lld or bfd.

www/chromium/patches/patch-build_toolchain_gcc_toolchain_gni

@@ -1,4 +1,4 @@
-$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.15 2018/07/30 15:28:28 robert Exp $
+$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.16 2018/11/04 12:33:24 robert Exp $
 Index: build/toolchain/gcc_toolchain.gni
 --- build/toolchain/gcc_toolchain.gni.orig
 +++ build/toolchain/gcc_toolchain.gni
@@ -14,7 +14,7 @@ Index: build/toolchain/gcc_toolchain.gni
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -604,12 +609,12 @@ template("clang_toolchain") {
+@@ -577,12 +582,12 @@ template("clang_toolchain") {
    }
  
    gcc_toolchain(target_name) {

www/chromium/patches/patch-cc_BUILD_gn

@@ -1,24 +1,24 @@
-$OpenBSD: patch-cc_BUILD_gn,v 1.18 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-cc_BUILD_gn,v 1.19 2018/11/04 12:33:24 robert Exp $
+
 Index: cc/BUILD.gn
 --- cc/BUILD.gn.orig
 +++ cc/BUILD.gn
-@@ -550,7 +550,7 @@ cc_static_library("test_support") {
+@@ -551,7 +551,7 @@ cc_static_library("test_support") {
      "//ui/gl:test_support",
      "//ui/latency",
    ]
 -  if (!is_android) {
 +  if (!is_android && !is_openbsd) {
      data_deps = [
-       "//third_party/mesa:osmesa",
+       "//third_party/mesa_headers",
      ]
-@@ -750,10 +750,6 @@ cc_test("cc_unittests") {
+@@ -751,9 +751,6 @@ cc_test("cc_unittests") {
      "//ui/gfx/geometry",
      "//ui/gl",
      "//ui/gl:test_support",
 -  ]
--
 -  data_deps = [
--    "//third_party/mesa:osmesa",
+-    "//third_party/mesa_headers",
    ]
  }
  

www/chromium/patches/patch-chrome_app_chrome_command_ids_h

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.6 2018/04/23 15:00:16 robert Exp $
+$OpenBSD: patch-chrome_app_chrome_command_ids_h,v 1.7 2018/11/04 12:33:24 robert Exp $
 Index: chrome/app/chrome_command_ids.h
 --- chrome/app/chrome_command_ids.h.orig
 +++ chrome/app/chrome_command_ids.h
-@@ -67,7 +67,7 @@
+@@ -63,7 +63,7 @@
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
  

www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.46 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.47 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/app/chrome_main_delegate.cc
 --- chrome/app/chrome_main_delegate.cc.orig
@@ -30,6 +30,15 @@ Index: chrome/app/chrome_main_delegate.cc
  void AdjustLinuxOOMScore(const std::string& process_type) {
    // Browsers and zygotes should still be killable, but killed last.
    const int kZygoteScore = 0;
+@@ -337,7 +337,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+   return false;
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ // Show the man page if --help or -h is on the command line.
+ void HandleHelpSwitches(const base::CommandLine& command_line) {
+   if (command_line.HasSwitch(switches::kHelp) ||
 @@ -349,7 +349,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
  }
  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -48,7 +57,16 @@ Index: chrome/app/chrome_main_delegate.cc
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -574,7 +574,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -556,7 +556,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+     *exit_code = 0;
+     return true;  // Got a --version switch; exit with a success error code.
+   }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   // This will directly exit if the user asked for help.
+   HandleHelpSwitches(command_line);
+ #endif
+@@ -580,7 +580,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
  #if defined(OS_CHROMEOS)
    chromeos::RegisterPathProvider();
  #endif
@@ -57,7 +75,7 @@ Index: chrome/app/chrome_main_delegate.cc
    nacl::RegisterPathProvider();
  #endif
  
-@@ -885,7 +885,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -897,7 +897,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    InitializePDF();
  #endif
  
@@ -66,7 +84,7 @@ Index: chrome/app/chrome_main_delegate.cc
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != service_manager::switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -911,7 +911,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -923,7 +923,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
  void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
    // Note: If you are adding a new process type below, be sure to adjust the
    // AdjustLinuxOOMScore function too.

www/chromium/patches/patch-chrome_app_chromium_strings_grd

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.33 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.34 2018/11/04 12:33:24 robert Exp $
 Index: chrome/app/chromium_strings.grd
 --- chrome/app/chromium_strings.grd.orig
 +++ chrome/app/chromium_strings.grd
@@ -7,7 +7,16 @@ Index: chrome/app/chromium_strings.grd
  
        <!-- ProcessSingleton -->
 -      <if expr="is_linux or is_macosx">
-+      <if expr="is_linux or is_macosx or is_posix">
++      <if expr="is_posix or is_macosx or is_posix">
          <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
            The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
          </message>
+@@ -1059,7 +1059,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+       </message>
+ 
+       <!-- Plugin Placeholders -->
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
+           Restart Chromium to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
+         </message>

www/chromium/patches/patch-chrome_app_generated_resources_grd

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.29 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.30 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/app/generated_resources.grd
 --- chrome/app/generated_resources.grd.orig
@@ -12,16 +12,16 @@ Index: chrome/app/generated_resources.grd
  for making strings OS specific.  Other platform defines such as use_titlecase
  are declared in tools/grit/grit_rule.gni.
  -->
-@@ -5208,7 +5208,7 @@ the Bookmarks menu.">
+@@ -5265,7 +5265,7 @@ the Bookmarks menu.">
          </message>
        </if>
  
 -      <if expr="is_win or (is_linux and not chromeos)">
 +      <if expr="is_win or (is_posix and not chromeos)">
-         <!-- Confirm to quit panel -->
-         <message name="IDS_CONFIRM_TO_QUIT_DESCRIPTION" desc="Instructions for how the user should confirm quitting.">
-           Hold |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>|+|<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit
-@@ -6064,7 +6064,7 @@ the Bookmarks menu.">
+         <message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts.">
+           Press |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>| followed by |<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit
+         </message>
+@@ -6117,7 +6117,7 @@ the Bookmarks menu.">
          Google Pay
        </message>
  
@@ -30,7 +30,7 @@ Index: chrome/app/generated_resources.grd
          <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
            Use system title bar and borders
          </message>
-@@ -6895,7 +6895,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -6942,7 +6942,7 @@ Please help our engineers fix this problem. Tell us wh
          Set as default
        </message>
  

www/chromium/patches/patch-chrome_app_google_chrome_strings_grd

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.32 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.33 2018/11/04 12:33:24 robert Exp $
 Index: chrome/app/google_chrome_strings.grd
 --- chrome/app/google_chrome_strings.grd.orig
 +++ chrome/app/google_chrome_strings.grd
@@ -7,7 +7,16 @@ Index: chrome/app/google_chrome_strings.grd
  
        <!-- ProcessSingleton -->
 -      <if expr="is_linux or is_macosx">
-+      <if expr="is_linux or is_macosx or is_posix">
++      <if expr="is_posix or is_macosx or is_posix">
          <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
            The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>).  Chrome has locked the profile so that it doesn't get corrupted.  If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
          </message>
+@@ -1077,7 +1077,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+       </message>
+ 
+       <!-- Plugin Placeholders -->
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
+           Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
+         </message>

www/chromium/patches/patch-chrome_app_settings_strings_grdp

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_app_settings_strings_grdp,v 1.13 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_app_settings_strings_grdp,v 1.14 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/app/settings_strings.grdp
 --- chrome/app/settings_strings.grdp.orig
 +++ chrome/app/settings_strings.grdp
-@@ -508,7 +508,7 @@
+@@ -511,7 +511,7 @@
        Themes
      </message>
    </if>
@@ -12,7 +12,7 @@ Index: chrome/app/settings_strings.grdp
      <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
        GTK+
      </message>
-@@ -522,7 +522,7 @@
+@@ -525,7 +525,7 @@
        Use Classic
      </message>
    </if>

www/chromium/patches/patch-chrome_browser_about_flags_cc

@@ -1,9 +1,18 @@
-$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.45 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.46 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/about_flags.cc
 --- chrome/browser/about_flags.cc.orig
 +++ chrome/browser/about_flags.cc
-@@ -2436,7 +2436,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -841,7 +841,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS
+     {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050,
+      base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}};
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ const FeatureEntry::FeatureParam kAutofillPrimaryInfoStyleMedium[] = {
+     {autofill::kAutofillForcedFontWeightParameterName,
+      autofill::kAutofillForcedFontWeightParameterMedium},
+@@ -2610,7 +2610,7 @@ const FeatureEntry kFeatureEntries[] = {
      {"force-text-direction", flag_descriptions::kForceTextDirectionName,
       flag_descriptions::kForceTextDirectionDescription, kOsAll,
       MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -12,7 +21,16 @@ Index: chrome/browser/about_flags.cc
      {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName,
       flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux,
       ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
-@@ -3059,7 +3059,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2844,7 +2844,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(
+          password_manager::features::kPasswordsKeyboardAccessory)},
+ #endif  // OS_ANDROID
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+     {"passwords-migrate-linux-to-login-db",
+      flag_descriptions::kPasswordsMigrateLinuxToLoginDBName,
+      flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux,
+@@ -3255,7 +3255,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
  
@@ -21,7 +39,7 @@ Index: chrome/browser/about_flags.cc
      {"omnibox-new-answer-layout",
       flag_descriptions::kOmniboxNewAnswerLayoutName,
       flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop,
-@@ -3415,7 +3415,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3617,7 +3617,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -30,7 +48,16 @@ Index: chrome/browser/about_flags.cc
      {"direct-manipulation-stylus",
       flag_descriptions::kDirectManipulationStylusName,
       flag_descriptions::kDirectManipulationStylusDescription,
-@@ -3913,7 +3913,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4091,7 +4091,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kAutofillCacheQueryResponsesDescription, kOsAll,
+      FEATURE_VALUE_TYPE(autofill::features::kAutofillCacheQueryResponses)},
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+     {"autofill-primary-info-style",
+      flag_descriptions::kAutofillPrimaryInfoStyleExperimentName,
+      flag_descriptions::kAutofillPrimaryInfoStyleExperimentDescription,
+@@ -4152,7 +4152,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kOverviewSwipeToClose)},
  #endif  // OS_CHROMEOS
  

www/chromium/patches/patch-chrome_browser_browser_process_impl_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-chrome_browser_browser_process_impl_cc,v 1.29 2018/11/04 12:33:24 robert Exp $
+
+Index: chrome/browser/browser_process_impl.cc
+--- chrome/browser/browser_process_impl.cc.orig
++++ chrome/browser/browser_process_impl.cc
+@@ -1459,7 +1459,7 @@ void BrowserProcessImpl::Unpin() {
+ }
+ 
+ // Mac is currently not supported.
+-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ 
+ bool BrowserProcessImpl::IsRunningInBackground() const {
+   // Check if browser is in the background.

www/chromium/patches/patch-chrome_browser_browser_process_impl_h

@@ -0,0 +1,14 @@
+$OpenBSD: patch-chrome_browser_browser_process_impl_h,v 1.20 2018/11/04 12:33:24 robert Exp $
+
+Index: chrome/browser/browser_process_impl.h
+--- chrome/browser/browser_process_impl.h.orig
++++ chrome/browser/browser_process_impl.h
+@@ -341,7 +341,7 @@ class BrowserProcessImpl : public BrowserProcess,
+   std::unique_ptr<ChromeResourceDispatcherHostDelegate>
+       resource_dispatcher_host_delegate_;
+ 
+-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
+   base::RepeatingTimer autoupdate_timer_;
+ 
+   // Gets called by autoupdate timer to see if browser needs restart and can be

www/chromium/patches/patch-chrome_browser_browser_resources_grd

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.45 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.46 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/browser_resources.grd
 --- chrome/browser/browser_resources.grd.orig
 +++ chrome/browser/browser_resources.grd
-@@ -643,7 +643,7 @@
+@@ -655,7 +655,7 @@
          <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
        </if>
        <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />

www/chromium/patches/patch-chrome_browser_chrome_browser_main_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.26 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.27 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/chrome_browser_main.cc
 --- chrome/browser/chrome_browser_main.cc.orig
 +++ chrome/browser/chrome_browser_main.cc
-@@ -216,7 +216,7 @@
+@@ -214,7 +214,7 @@
  #include "chromeos/settings/cros_settings_names.h"
  #endif  // defined(OS_CHROMEOS)
  
@@ -12,7 +12,7 @@ Index: chrome/browser/chrome_browser_main.cc
  #include "chrome/browser/first_run/upgrade_util_linux.h"
  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
  
-@@ -257,7 +257,7 @@
+@@ -255,7 +255,7 @@
  #endif  // defined(OS_WIN)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -21,7 +21,7 @@ Index: chrome/browser/chrome_browser_main.cc
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #endif
  
-@@ -1274,7 +1274,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1266,7 +1266,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
      }
  
@@ -30,7 +30,7 @@ Index: chrome/browser/chrome_browser_main.cc
      // Create directory for user-level Native Messaging manifest files. This
      // makes it less likely that the directory will be created by third-party
      // software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1287,7 +1287,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1279,7 +1279,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
    }
  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  
@@ -39,7 +39,7 @@ Index: chrome/browser/chrome_browser_main.cc
    // Set the product channel for crash reports.
    breakpad::SetChannelCrashKey(chrome::GetChannelName());
  #endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
-@@ -1313,7 +1313,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1305,7 +1305,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
      tracing::SetupNavigationTracing();
    }
  

www/chromium/patches/patch-chrome_browser_chrome_browser_main_linux_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.8 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.9 2018/11/04 12:33:24 robert Exp $
 Index: chrome/browser/chrome_browser_main_linux.cc
 --- chrome/browser/chrome_browser_main_linux.cc.orig
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -88,12 +88,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
  void ChromeBrowserMainPartsLinux::PostProfileInit() {
    ChromeBrowserMainPartsPosix::PostProfileInit();
  
@@ -18,7 +18,7 @@ Index: chrome/browser/chrome_browser_main_linux.cc
    bluez::DBusThreadManagerLinux::Initialize();
    bluez::BluezDBusManager::Initialize(
        bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
-@@ -103,7 +105,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+@@ -106,7 +108,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
  }
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {

www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.48 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.49 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/chrome_content_browser_client.cc
 --- chrome/browser/chrome_content_browser_client.cc.orig
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -334,7 +334,7 @@
+@@ -341,7 +341,7 @@
  #include "chromeos/services/secure_channel/secure_channel_service.h"
  #include "components/user_manager/user_manager.h"
  #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
@@ -12,8 +12,8 @@ Index: chrome/browser/chrome_content_browser_client.cc
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "base/android/application_status_listener.h"
-@@ -373,7 +373,7 @@
- #include "chrome/common/importer/profile_import.mojom.h"
+@@ -384,7 +384,7 @@
+ #include "components/services/patch/public/interfaces/constants.mojom.h"
  #endif
  
 -#if defined(OS_LINUX) || defined(OS_WIN)
@@ -21,7 +21,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
  #include "chrome/browser/webshare/share_service_impl.h"
  #endif
  
-@@ -387,7 +387,7 @@
+@@ -398,7 +398,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -30,7 +30,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -696,7 +696,7 @@ bool IsAutoplayAllowedByPolicy(content::WebContents* c
+@@ -715,7 +715,7 @@ bool IsAutoplayAllowedByPolicy(content::WebContents* c
  }
  #endif
  
@@ -39,16 +39,16 @@ Index: chrome/browser/chrome_content_browser_client.cc
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -1099,7 +1099,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
- #elif defined(OS_CHROMEOS)
+@@ -1090,7 +1090,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
    main_parts = new chromeos::ChromeBrowserMainPartsChromeos(
-       parameters, std::move(service_manifest_data_pack_));
+       parameters, std::move(service_manifest_data_pack_),
+       chrome_feature_list_creator_);
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    main_parts = new ChromeBrowserMainPartsLinux(
-       parameters, std::move(service_manifest_data_pack_));
- #elif defined(OS_ANDROID)
-@@ -1119,7 +1119,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+       parameters, std::move(service_manifest_data_pack_),
+       chrome_feature_list_creator_);
+@@ -1114,7 +1114,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
    // Construct additional browser parts. Stages are called in the order in
    // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -66,7 +66,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
    if (breakpad::IsCrashReporterEnabled()) {
      std::string switch_value;
      std::unique_ptr<metrics::ClientInfo> client_info =
-@@ -3335,7 +3335,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3383,7 +3383,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -75,7 +75,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -4097,7 +4097,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa
+@@ -4212,7 +4212,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa
  #if defined(OS_ANDROID)
    frame_interfaces_parameterized_->AddInterface(base::Bind(
        &ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>));
@@ -84,7 +84,7 @@ Index: chrome/browser/chrome_content_browser_client.cc
    frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create));
  #endif
  
-@@ -4609,7 +4609,7 @@ std::unique_ptr<content::OverlayWindow>
+@@ -4707,7 +4707,7 @@ std::unique_ptr<content::OverlayWindow>
  ChromeContentBrowserClient::CreateWindowForPictureInPicture(
      content::PictureInPictureWindowController* controller) {
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \

www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.37 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.38 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/chrome_content_browser_client.h
 --- chrome/browser/chrome_content_browser_client.h.orig
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -326,7 +326,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -340,7 +340,7 @@ class ChromeContentBrowserClient : public content::Con
    void OverridePageVisibilityState(
        content::RenderFrameHost* render_frame_host,
        blink::mojom::PageVisibilityState* visibility_state) override;

www/chromium/patches/patch-chrome_browser_defaults_cc

@@ -1,7 +1,8 @@
-$OpenBSD: patch-chrome_browser_defaults_cc,v 1.8 2016/05/27 06:28:20 robert Exp $
---- chrome/browser/defaults.cc.orig.port	Wed May 25 04:54:08 2016
-+++ chrome/browser/defaults.cc	Thu May 26 08:09:40 2016
-@@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true;
+$OpenBSD: patch-chrome_browser_defaults_cc,v 1.9 2018/11/04 12:33:24 robert Exp $
+Index: chrome/browser/defaults.cc
+--- chrome/browser/defaults.cc.orig
++++ chrome/browser/defaults.cc
+@@ -43,7 +43,7 @@ const bool kSyncAutoStarts = true;
  const bool kSyncAutoStarts = false;
  #endif
  

www/chromium/patches/patch-chrome_browser_devtools_devtools_eye_dropper_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_devtools_devtools_eye_dropper_cc,v 1.6 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_devtools_devtools_eye_dropper_cc,v 1.7 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/devtools/devtools_eye_dropper.cc
 --- chrome/browser/devtools/devtools_eye_dropper.cc.orig
 +++ chrome/browser/devtools/devtools_eye_dropper.cc
-@@ -211,7 +211,7 @@ void DevToolsEyeDropper::UpdateCursor() {
+@@ -174,7 +174,7 @@ void DevToolsEyeDropper::UpdateCursor() {
  // magnified projection only with centered hotspot.
  // Mac Retina requires cursor to be > 120px in order to render smoothly.
  

www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.23 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.24 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/download/chrome_download_manager_delegate.cc
 --- chrome/browser/download/chrome_download_manager_delegate.cc.orig
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1157,7 +1157,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1197,7 +1197,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
          target_info->is_filetype_handled_safely)
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  
@@ -12,7 +12,7 @@ Index: chrome/browser/download/chrome_download_manager_delegate.cc
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
-@@ -1177,7 +1177,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1217,7 +1217,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
  
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
      const base::FilePath& path) {

www/chromium/patches/patch-chrome_browser_extensions_BUILD_gn

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.18 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_BUILD_gn,v 1.19 2018/11/04 12:33:24 robert Exp $
 Index: chrome/browser/extensions/BUILD.gn
 --- chrome/browser/extensions/BUILD.gn.orig
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1133,6 +1133,10 @@ jumbo_static_library("extensions") {
+@@ -1149,6 +1149,10 @@ jumbo_static_library("extensions") {
      deps += [ "//chrome/common:service_process_mojom" ]
    }
  

www/chromium/patches/patch-chrome_browser_extensions_api_settings_private_prefs_util_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_extensions_api_settings_private_prefs_util_cc,v 1.11 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_api_settings_private_prefs_util_cc,v 1.12 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -127,7 +127,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -125,7 +125,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
    (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
@@ -12,7 +12,7 @@ Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
    (*s_whitelist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
  #endif
-@@ -137,7 +137,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -135,7 +135,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
    // Appearance settings.
    (*s_whitelist)[::prefs::kCurrentThemeID] =
        settings_api::PrefType::PREF_TYPE_STRING;

www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc

@@ -1,13 +1,14 @@
-$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.24 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.25 2018/11/04 12:33:24 robert Exp $
+
 Index: chrome/browser/extensions/bookmark_app_helper.cc
 --- chrome/browser/extensions/bookmark_app_helper.cc.orig
 +++ chrome/browser/extensions/bookmark_app_helper.cc
-@@ -784,7 +784,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
- #if !defined(OS_MACOSX)
+@@ -597,7 +597,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
+   if (create_shortcuts_) {
  #if !defined(OS_CHROMEOS)
-   web_app::ShortcutLocations creation_locations;
+     web_app::ShortcutLocations creation_locations;
 -#if defined(OS_LINUX) || defined(OS_WIN)
 +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
-   creation_locations.on_desktop = true;
+     creation_locations.on_desktop = true;
  #else
-   creation_locations.on_desktop = false;
+     creation_locations.on_desktop = false;

www/chromium/patches/patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.11 2018/06/02 17:19:23 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_browser_context_keyed_service_factories_cc,v 1.12 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/extensions/browser_context_keyed_service_factories.cc
 --- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig
 +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
  #include "chrome/browser/chromeos/extensions/media_player_api.h"
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h"
@@ -12,7 +12,7 @@ Index: chrome/browser/extensions/browser_context_keyed_service_factories.cc
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #endif
  
-@@ -99,7 +99,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
+@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
  #if defined(OS_CHROMEOS)
    extensions::InputImeAPI::GetFactoryInstance();
    extensions::InputMethodAPI::GetFactoryInstance();

www/chromium/patches/patch-chrome_browser_extensions_external_provider_impl_cc

@@ -1,18 +1,18 @@
-$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.10 2018/03/12 13:48:34 robert Exp $
+$OpenBSD: patch-chrome_browser_extensions_external_provider_impl_cc,v 1.11 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/extensions/external_provider_impl.cc
 --- chrome/browser/extensions/external_provider_impl.cc.orig
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -689,7 +689,7 @@ void ExternalProviderImpl::CreateExternalProviders(
-         Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
-         oem_extension_creation_flags));
+@@ -711,7 +711,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+     provider_list->push_back(std::move(demo_apps_provider));
    }
+ 
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    if (!profile->IsLegacySupervised()) {
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
-@@ -717,7 +717,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -739,7 +739,7 @@ void ExternalProviderImpl::CreateExternalProviders(
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.

www/chromium/patches/patch-chrome_browser_flag_descriptions_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_flag_descriptions_cc,v 1.11 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_flag_descriptions_cc,v 1.12 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/flag_descriptions.cc
 --- chrome/browser/flag_descriptions.cc.orig
 +++ chrome/browser/flag_descriptions.cc
-@@ -3411,7 +3411,7 @@ extern const char kEnableContinueReadingDescription[] 
+@@ -3599,7 +3599,7 @@ const char kZipArchiverUnpackerDescription[] =
  
  // Random platform combinations -----------------------------------------------
  
@@ -12,7 +12,7 @@ Index: chrome/browser/flag_descriptions.cc
  
  const char kEnableInputImeApiName[] = "Enable Input IME API";
  const char kEnableInputImeApiDescription[] =
-@@ -3438,7 +3438,7 @@ const char kAutomaticTabDiscardingDescription[] =
+@@ -3618,7 +3618,7 @@ const char kAutomaticTabDiscardingDescription[] =
  
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  

www/chromium/patches/patch-chrome_browser_flag_descriptions_h

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_flag_descriptions_h,v 1.11 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_flag_descriptions_h,v 1.12 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/flag_descriptions.h
 --- chrome/browser/flag_descriptions.h.orig
 +++ chrome/browser/flag_descriptions.h
-@@ -2087,7 +2087,7 @@ extern const char kEnableContinueReadingDescription[];
+@@ -2183,7 +2183,7 @@ extern const char kZipArchiverUnpackerDescription[];
  
  // Random platform combinations -----------------------------------------------
  
@@ -12,7 +12,7 @@ Index: chrome/browser/flag_descriptions.h
  
  extern const char kEnableInputImeApiName[];
  extern const char kEnableInputImeApiDescription[];
-@@ -2111,7 +2111,7 @@ extern const char kAutomaticTabDiscardingDescription[]
+@@ -2200,7 +2200,7 @@ extern const char kAutomaticTabDiscardingDescription[]
  
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  

www/chromium/patches/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider_cc

@@ -1,25 +0,0 @@
-$OpenBSD: patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider_cc,v 1.1 2018/04/23 15:00:16 robert Exp $
-
-Index: chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig
-+++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
-@@ -111,6 +111,11 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
-     bool incognito,
-     CreateRouteCallback callback) {
-   DCHECK(!base::ContainsKey(presentations_, presentation_id));
-+#if defined(OS_BSD) // XXX
-+  std::move(callback).Run(base::nullopt, std::string("Not implemented"),
-+                          RouteRequestResult::UNKNOWN_ERROR);
-+  return;
-+#else
-   base::Optional<Display> display = GetDisplayBySinkId(sink_id);
-   if (!display) {
-     std::move(callback).Run(base::nullopt, std::string("Display not found"),
-@@ -135,6 +140,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
-   presentation.receiver()->Start(presentation_id, GURL(media_source));
-   std::move(callback).Run(route, base::nullopt, RouteRequestResult::OK);
-   NotifyRouteObservers();
-+#endif
- }
- 
- void WiredDisplayMediaRouteProvider::JoinRoute(

www/chromium/patches/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_media_webrtc_webrtc_event_log_uploader_cc,v 1.2 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_media_webrtc_webrtc_event_log_uploader_cc,v 1.3 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
 --- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig
 +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-@@ -29,7 +29,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000;  /
+@@ -34,7 +34,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000;  /
  const char kProduct[] = "Chrome";
  #elif defined(OS_MACOSX)
  const char kProduct[] = "Chrome_Mac";

www/chromium/patches/patch-chrome_browser_memory_details_cc

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.40 2018/07/30 15:28:28 robert Exp $
+$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.41 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/memory_details.cc
 --- chrome/browser/memory_details.cc.orig
@@ -12,7 +12,7 @@ Index: chrome/browser/memory_details.cc
  #include "services/service_manager/zygote/zygote_host_linux.h"
  #endif
  
-@@ -341,7 +341,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
        process.titles.push_back(title);
      }
  

www/chromium/patches/patch-chrome_browser_metrics_chrome_metrics_service_client_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_metrics_chrome_metrics_service_client_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_metrics_chrome_metrics_service_client_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/metrics/chrome_metrics_service_client.cc
 --- chrome/browser/metrics/chrome_metrics_service_client.cc.orig
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -903,7 +903,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -900,7 +900,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
    }
  #endif
  #if defined(OS_WIN) || defined(OS_MACOSX) || \

www/chromium/patches/patch-chrome_browser_net_system_network_context_manager_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_net_system_network_context_manager_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_net_system_network_context_manager_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/net/system_network_context_manager.cc
 --- chrome/browser/net/system_network_context_manager.cc.orig
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -49,7 +49,7 @@
+@@ -65,7 +65,7 @@
  #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
  #endif  // defined(OS_CHROMEOS)
  
@@ -12,7 +12,7 @@ Index: chrome/browser/net/system_network_context_manager.cc
  #include "chrome/common/chrome_paths_internal.h"
  #include "chrome/common/chrome_switches.h"
  #include "chrome/grit/chromium_strings.h"
-@@ -440,7 +440,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -476,7 +476,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    content::GetNetworkService()->ConfigureStubHostResolver(
        stub_resolver_enabled, std::move(dns_over_https_servers));
  

www/chromium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc

@@ -1,13 +0,0 @@
-$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.17 2018/06/02 17:19:23 robert Exp $
-Index: chrome/browser/notifications/message_center_notification_manager.cc
---- chrome/browser/notifications/message_center_notification_manager.cc.orig
-+++ chrome/browser/notifications/message_center_notification_manager.cc
-@@ -45,7 +45,7 @@ MessageCenterNotificationManager::MessageCenterNotific
-       std::make_unique<FullscreenNotificationBlocker>(message_center));
- #endif
- 
--#if defined(OS_WIN) || defined(OS_MACOSX) \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) \
-   || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-   // On Windows, Linux and Mac, the notification manager owns the tray icon and
-   // views.Other platforms have global ownership and Create will return NULL.

www/chromium/patches/patch-chrome_browser_password_manager_password_store_factory_cc

@@ -1,11 +1,11 @@
-$OpenBSD: patch-chrome_browser_password_manager_password_store_factory_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_password_manager_password_store_factory_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/password_manager/password_store_factory.cc
 --- chrome/browser/password_manager/password_store_factory.cc.orig
 +++ chrome/browser/password_manager/password_store_factory.cc
-@@ -283,7 +283,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
-   password_manager_util::CleanUserDataInBlacklistedCredentials(
-       ps.get(), profile->GetPrefs(), 60);
+@@ -305,7 +305,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
+                      network_context_getter),
+       base::TimeDelta::FromSeconds(60));
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || \
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \

www/chromium/patches/patch-chrome_browser_prefs_browser_prefs_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_prefs_browser_prefs_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_prefs_browser_prefs_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/prefs/browser_prefs.cc
 --- chrome/browser/prefs/browser_prefs.cc.orig
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -284,7 +284,7 @@
+@@ -293,7 +293,7 @@
  #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
  #endif
  
@@ -12,7 +12,7 @@ Index: chrome/browser/prefs/browser_prefs.cc
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  #include "chrome/browser/ui/confirm_quit.h"
  #endif
-@@ -724,7 +724,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -744,7 +744,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
    NotificationChannelsProviderAndroid::RegisterProfilePrefs(registry);
  #endif
  

www/chromium/patches/patch-chrome_browser_prefs_pref_service_incognito_whitelist_cc

@@ -1,36 +1,27 @@
-$OpenBSD: patch-chrome_browser_prefs_pref_service_incognito_whitelist_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_prefs_pref_service_incognito_whitelist_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/prefs/pref_service_incognito_whitelist.cc
 --- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig
 +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc
-@@ -270,7 +270,7 @@ const char* incognito_whitelist[] = {
- #if defined(OS_ANDROID)
-     prefs::kContextualSearchEnabled,
- #endif  // defined(OS_ANDROID)
--#if defined(OS_MACOSX) || defined(OS_WIN) || \
-+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \
-     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-     prefs::kConfirmToQuitEnabled,
- #endif
-@@ -348,7 +348,7 @@ const char* incognito_whitelist[] = {
-     prefs::kForceGoogleSafeSearch, prefs::kForceYouTubeRestrict,
-     prefs::kForceSessionSync, prefs::kAllowedDomainsForApps,
-     prefs::kSafeSitesFilterBehavior,
+@@ -228,7 +228,7 @@ const char* const kTemporaryIncognitoWhitelist[] = {
+     prefs::kScreenTimeMinutesUsed, prefs::kUsageTimeLimit,
+     prefs::kScreenTimeLastState, prefs::kEnableSyncConsent,
+ #endif  // defined(OS_CHROMEOS)
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
      prefs::kUsesSystemTheme,
  #endif
      prefs::kCurrentThemePackFilename, prefs::kCurrentThemeID,
-@@ -372,7 +372,7 @@ const char* incognito_whitelist[] = {
+@@ -249,7 +249,7 @@ const char* const kTemporaryIncognitoWhitelist[] = {
  #if defined(OS_MACOSX)
      prefs::kShowUpdatePromotionInfoBar,
  #endif
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
      prefs::kUseCustomChromeFrame,
  #endif
  #if BUILDFLAG(ENABLE_PLUGINS)
-@@ -491,7 +491,7 @@ const char* incognito_whitelist[] = {
+@@ -314,7 +314,7 @@ const char* const kTemporaryIncognitoWhitelist[] = {
  
      prefs::kDownloadDefaultDirectory, prefs::kDownloadExtensionsToOpen,
      prefs::kDownloadDirUpgraded,
@@ -38,4 +29,4 @@ Index: chrome/browser/prefs/pref_service_incognito_whitelist.cc
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
      prefs::kOpenPdfDownloadInSystemReader,
  #endif
- #if defined(OS_ANDROID)
+ 

www/chromium/patches/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 --- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -305,7 +305,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -315,7 +315,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if !defined(OS_ANDROID)
    MediaGalleriesPreferencesFactory::GetInstance();
  #endif

www/chromium/patches/patch-chrome_browser_profiles_profile_io_data_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_profiles_profile_io_data_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_profiles_profile_io_data_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/profiles/profile_io_data.cc
 --- chrome/browser/profiles/profile_io_data.cc.orig
 +++ chrome/browser/profiles/profile_io_data.cc
-@@ -166,7 +166,7 @@
+@@ -170,7 +170,7 @@
  #include "net/reporting/reporting_service.h"
  #endif  // BUILDFLAG(ENABLE_REPORTING)
  
@@ -12,7 +12,7 @@ Index: chrome/browser/profiles/profile_io_data.cc
  #include "chrome/browser/net/trial_comparison_cert_verifier.h"
  #include "net/cert/cert_verify_proc_builtin.h"
  #endif
-@@ -1115,7 +1115,7 @@ void ProfileIOData::Init(
+@@ -1135,7 +1135,7 @@ void ProfileIOData::Init(
              std::make_unique<net::MultiThreadedCertVerifier>(
                  verify_proc.get()));
        }

www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.25 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.26 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/resources/plugin_metadata/plugins_linux.json
 --- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig
@@ -17,9 +17,9 @@ Index: chrome/browser/resources/plugin_metadata/plugins_linux.json
 -    ],
 -    "versions": [
 -      {
--        "version": "30.0.0.154",
+-        "version": "31.0.0.122",
 -        "status": "up_to_date",
--        "reference": "https://helpx.adobe.com/security/products/flash-player/apsb18-25.html"
+-        "reference": "https://helpx.adobe.com/security/products/flash-player/apsb18-35.html"
 -      }
 -    ],
 -    "lang": "en-US",

www/chromium/patches/patch-chrome_browser_signin_account_consistency_mode_manager_cc

@@ -1,23 +0,0 @@
-$OpenBSD: patch-chrome_browser_signin_account_consistency_mode_manager_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
-
-Index: chrome/browser/signin/account_consistency_mode_manager.cc
---- chrome/browser/signin/account_consistency_mode_manager.cc.orig
-+++ chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -20,7 +20,7 @@
- #include "content/public/browser/browser_thread.h"
- #include "google_apis/google_api_keys.h"
- 
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/base/ui_base_features.h"
- #endif
- 
-@@ -258,7 +258,7 @@ AccountConsistencyModeManager::ComputeAccountConsisten
-   AccountConsistencyMethod method =
-       AccountConsistencyMethod::kDicePrepareMigration;
- 
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-   if (base::FeatureList::IsEnabled(features::kExperimentalUi))
-     method = AccountConsistencyMethod::kDiceMigration;
- #endif

www/chromium/patches/patch-chrome_browser_ssl_ssl_error_controller_client_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ssl_ssl_error_controller_client_cc,v 1.3 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ssl_ssl_error_controller_client_cc,v 1.4 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ssl/ssl_error_controller_client.cc
 --- chrome/browser/ssl/ssl_error_controller_client.cc.orig
 +++ chrome/browser/ssl/ssl_error_controller_client.cc
-@@ -77,7 +77,7 @@ void LaunchDateAndTimeSettingsImpl() {
+@@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() {
  #if defined(OS_ANDROID)
    chrome::android::OpenDateAndTimeSettings();
  

www/chromium/patches/patch-chrome_browser_sync_chrome_sync_client_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.20 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.21 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/sync/chrome_sync_client.cc
 --- chrome/browser/sync/chrome_sync_client.cc.orig
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -389,7 +389,7 @@ ChromeSyncClient::CreateDataTypeControllers(
+@@ -410,7 +410,7 @@ ChromeSyncClient::CreateDataTypeControllers(
        BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
  #endif  // BUILDFLAG(ENABLE_APP_LIST)
  

www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.11 2018/07/30 15:28:28 robert Exp $
+$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.12 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/tracing/crash_service_uploader.cc
 --- chrome/browser/tracing/crash_service_uploader.cc.orig
 +++ chrome/browser/tracing/crash_service_uploader.cc
-@@ -158,6 +158,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
+@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
    const char product[] = "Chrome_Linux";
  #elif defined(OS_ANDROID)
    const char product[] = "Chrome_Android";

www/chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.33 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.34 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/browser_command_controller.cc
 --- chrome/browser/ui/browser_command_controller.cc.orig
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -77,7 +77,7 @@
+@@ -78,7 +78,7 @@
  #include "chrome/browser/ui/browser_commands_chromeos.h"
  #endif
  
@@ -12,7 +12,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -210,7 +210,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -215,7 +215,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  #endif
    }
  
@@ -21,7 +21,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -415,7 +415,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -420,7 +420,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -30,16 +30,7 @@ Index: chrome/browser/ui/browser_command_controller.cc
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -687,7 +687,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
-       ShowPageInfoDialog(browser_->tab_strip_model()->GetActiveWebContents(),
-                          bubble_anchor_util::kAppMenuButton);
-       break;
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_BSD) || defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-     case IDC_TOGGLE_CONFIRM_TO_QUIT_OPTION:
-       ToggleConfirmToQuitOption(browser_);
-       break;
-@@ -840,7 +840,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -845,7 +845,7 @@ void BrowserCommandController::InitCommandState() {
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
  #endif

www/chromium/patches/patch-chrome_browser_ui_browser_commands_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_browser_commands_cc,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_browser_commands_cc,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/browser_commands.cc
 --- chrome/browser/ui/browser_commands.cc.orig
 +++ chrome/browser/ui/browser_commands.cc
-@@ -1228,7 +1228,7 @@ bool CanViewSource(const Browser* browser) {
+@@ -1251,7 +1251,7 @@ bool CanViewSource(const Browser* browser) {
            CanViewSource();
  }
  

www/chromium/patches/patch-chrome_browser_ui_browser_commands_h

@@ -1,11 +1,11 @@
-$OpenBSD: patch-chrome_browser_ui_browser_commands_h,v 1.1 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_browser_commands_h,v 1.2 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/browser_commands.h
 --- chrome/browser/ui/browser_commands.h.orig
 +++ chrome/browser/ui/browser_commands.h
-@@ -148,7 +148,7 @@ bool IsDebuggerAttachedToCurrentTab(Browser* browser);
- void CopyURL(Browser* browser);
- void OpenInChrome(Browser* browser);
+@@ -150,7 +150,7 @@ void CopyURL(Browser* browser);
+ // the tabbed Browser.
+ Browser* OpenInChrome(Browser* hosted_app_browser);
  bool CanViewSource(const Browser* browser);
 -#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +#if defined(OS_BSD) || defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))

www/chromium/patches/patch-chrome_browser_ui_browser_view_prefs_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.11 2018/11/04 12:33:24 robert Exp $
+
+Index: chrome/browser/ui/browser_view_prefs.cc
+--- chrome/browser/ui/browser_view_prefs.cc.orig
++++ chrome/browser/ui/browser_view_prefs.cc
+@@ -34,7 +34,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple*
+ 
+ void RegisterBrowserViewProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   bool custom_frame_pref_default = false;
+ #if defined(USE_X11)
+   custom_frame_pref_default = ui::GetCustomFramePrefDefault();

www/chromium/patches/patch-chrome_browser_ui_libgtkui_print_dialog_gtk_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_browser_ui_libgtkui_print_dialog_gtk_cc,v 1.4 2018/07/30 15:28:28 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_libgtkui_print_dialog_gtk_cc,v 1.5 2018/11/04 12:33:24 robert Exp $
 Index: chrome/browser/ui/libgtkui/print_dialog_gtk.cc
 --- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig
 +++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc
-@@ -350,6 +350,7 @@ void PrintDialogGtk2::ShowDialog(
+@@ -330,6 +330,7 @@ void PrintDialogGtk::ShowDialog(
    // Since we only generate PDF, only show printers that support PDF.
    // TODO(thestig) Add more capabilities to support?
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(

www/chromium/patches/patch-chrome_browser_ui_tab_helpers_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_browser_ui_tab_helpers_cc,v 1.16 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_tab_helpers_cc,v 1.17 2018/11/04 12:33:24 robert Exp $
 Index: chrome/browser/ui/tab_helpers.cc
 --- chrome/browser/ui/tab_helpers.cc.orig
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
  #include "components/zoom/zoom_controller.h"
  #endif  // defined(OS_ANDROID)
  
@@ -11,7 +11,7 @@ Index: chrome/browser/ui/tab_helpers.cc
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #endif
  
-@@ -306,7 +306,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -311,7 +311,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
  #endif
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \

www/chromium/patches/patch-chrome_browser_ui_toolbar_app_menu_model_cc

@@ -1,17 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.16 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.17 2018/11/04 12:33:24 robert Exp $
+
 Index: chrome/browser/ui/toolbar/app_menu_model.cc
 --- chrome/browser/ui/toolbar/app_menu_model.cc.orig
 +++ chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -634,7 +634,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) 
-     return Profiling::BeingProfiled();
-   if (command_id == IDC_TOGGLE_REQUEST_TABLET_SITE)
-     return chrome::IsRequestingTabletSite(browser_);
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_BSD) || defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-   if (command_id == IDC_TOGGLE_CONFIRM_TO_QUIT_OPTION) {
-     return browser_->profile()->GetPrefs()->GetBoolean(
-         prefs::kConfirmToQuitEnabled);
-@@ -664,7 +664,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) 
+@@ -652,7 +652,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) 
      case IDC_UPGRADE_DIALOG:
        return browser_defaults::kShowUpgradeMenuItem &&
            UpgradeDetector::GetInstance()->notify_upgrade();
@@ -20,12 +12,3 @@ Index: chrome/browser/ui/toolbar/app_menu_model.cc
      case IDC_BOOKMARK_PAGE:
        return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile());
      case IDC_BOOKMARK_ALL_TABS:
-@@ -807,7 +807,7 @@ void AppMenuModel::Build() {
- 
-   if (browser_defaults::kShowExitMenuItem) {
-     AddSeparator(ui::NORMAL_SEPARATOR);
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_BSD) || defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-     if (base::FeatureList::IsEnabled(features::kWarnBeforeQuitting)) {
-       AddCheckItem(IDC_TOGGLE_CONFIRM_TO_QUIT_OPTION,
-                    l10n_util::GetStringFUTF16(

www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc

@@ -1,14 +0,0 @@
-$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc,v 1.9 2017/09/09 19:16:43 robert Exp $
-
-Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig
-+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
-@@ -19,7 +19,7 @@
- #include "ui/gfx/image/image_skia.h"
- #include "ui/views/widget/widget.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/shell_integration_linux.h"
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc,v 1.13 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_views_chrome_browser_main_extra_parts_views_cc,v 1.14 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
 --- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  #include "ui/wm/core/wm_state.h"
  #endif  // defined(USE_AURA)
  
@@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -119,7 +119,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -112,7 +112,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
    }
  #endif
  

www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc

@@ -1,23 +1,23 @@
-$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.13 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.14 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/views/frame/browser_view.cc
 --- chrome/browser/ui/views/frame/browser_view.cc.orig
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1150,7 +1150,7 @@ void BrowserView::RotatePaneFocus(bool forwards) {
+@@ -1161,7 +1161,7 @@ void BrowserView::RotatePaneFocus(bool forwards) {
  }
  
  void BrowserView::DestroyBrowser() {
 -#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_BSD) || defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-   GetWidget()->GetNativeView()->RemovePreTargetHandler(
-       ConfirmQuitBubbleController::GetInstance());
- #endif
-@@ -2201,7 +2201,7 @@ void BrowserView::InitViews() {
++#if defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
+   if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) {
+     GetWidget()->GetNativeView()->RemovePreTargetHandler(
+         QuitInstructionBubbleController::GetInstance());
+@@ -2282,7 +2282,7 @@ void BrowserView::InitViews() {
    GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
                                         browser_->profile());
  
 -#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_BSD) || defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-   GetWidget()->GetNativeView()->AddPreTargetHandler(
-       ConfirmQuitBubbleController::GetInstance());
- #endif
++#if defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
+   if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) {
+     GetWidget()->GetNativeView()->AddPreTargetHandler(
+         QuitInstructionBubbleController::GetInstance());

www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.31 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.32 2018/11/04 12:33:24 robert Exp $
 Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
 --- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -41,7 +41,7 @@
- #include "ui/views/window/frame_background.h"
+@@ -45,7 +45,7 @@
+ #include "ui/views/window/hit_test_utils.h"
  #include "ui/views/window/window_shape.h"
  
 -#if defined(OS_LINUX)
@@ -11,7 +11,7 @@ Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -326,7 +326,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+@@ -374,7 +374,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
  void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
                                                   const gfx::Point& point,
                                                   const ui::Event* event) {

www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc,v 1.11 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc,v 1.12 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
 --- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
-@@ -20,7 +20,7 @@ namespace {
+@@ -21,7 +21,7 @@ namespace {
  
  constexpr int kCaptionButtonHeight = 18;
  

www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.26 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.27 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
 --- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -394,7 +394,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
+@@ -406,7 +406,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
    //     synchronous on desktop Linux, so use that.
    // - Chrome OS
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -12,7 +12,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
    can_release_capture_ = false;
  #endif
    start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -762,7 +762,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* 
+@@ -780,7 +780,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* 
      else
        target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
  
@@ -21,7 +21,7 @@ Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2043,7 +2043,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2061,7 +2061,7 @@ TabDragController::Liveness TabDragController::GetLoca
      if (dragged_window)
        exclude.insert(dragged_window);
    }

www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.48 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.49 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/webui/about_ui.cc
 --- chrome/browser/ui/webui/about_ui.cc.orig
 +++ chrome/browser/ui/webui/about_ui.cc
-@@ -391,7 +391,7 @@ std::string ChromeURLs() {
+@@ -393,7 +393,7 @@ std::string ChromeURLs() {
    return html;
  }
  
@@ -12,7 +12,7 @@ Index: chrome/browser/ui/webui/about_ui.cc
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -446,7 +446,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -448,7 +448,7 @@ void AboutUIHTMLSource::StartDataRequest(
                       .GetRawDataResource(idr)
                       .as_string();
      }

www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.28 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.29 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -185,11 +185,11 @@
+@@ -187,11 +187,11 @@
  #include "chrome/browser/ui/webui/welcome_win10_ui.h"
  #endif
  
@@ -17,7 +17,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
  #include "chrome/browser/ui/webui/sandbox_internals_ui.h"
  #endif
  
-@@ -317,7 +317,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -319,7 +319,7 @@ bool IsAboutUI(const GURL& url) {
  #if !defined(OS_ANDROID)
            || url.host_piece() == chrome::kChromeUITermsHost
  #endif
@@ -26,7 +26,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
            || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
  #endif
  #if defined(OS_CHROMEOS)
-@@ -566,7 +566,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -572,7 +572,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host_piece() == chrome::kChromeUINaClHost)
      return &NewWebUI<NaClUI>;
  #endif
@@ -35,7 +35,7 @@ Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
    if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
      return &NewWebUI<ConstrainedWebDialogUI>;
  #endif
-@@ -625,12 +625,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -631,12 +631,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
      return &NewWebUI<CastUI>;
    }
  #endif

www/chromium/patches/patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc,v 1.18 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_browser_ui_webui_settings_md_settings_localized_strings_provider_cc,v 1.19 2018/11/04 12:33:24 robert Exp $
 Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
 --- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig
 +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-@@ -442,7 +442,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -451,7 +451,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
      {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
      {"themes", IDS_SETTINGS_THEMES},
@@ -11,7 +11,7 @@ Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.c
      {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
      {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
      {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -460,7 +460,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -469,7 +469,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
      {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
  #endif

www/chromium/patches/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut_cc,v 1.1 2018/11/04 12:33:24 robert Exp $
+
+Index: chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc
+--- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig
++++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc
+@@ -38,7 +38,7 @@ namespace {
+ #if defined(OS_MACOSX)
+ const int kDesiredSizes[] = {16, 32, 128, 256, 512};
+ const size_t kNumDesiredSizes = base::size(kDesiredSizes);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
+ // that "Minimally you should install a 48x48 icon in the hicolor theme."
+ const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};

www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc

@@ -1,22 +0,0 @@
-$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.24 2018/09/12 17:08:22 robert Exp $
-Index: chrome/browser/web_applications/web_app.cc
---- chrome/browser/web_applications/web_app.cc.orig
-+++ chrome/browser/web_applications/web_app.cc
-@@ -58,7 +58,7 @@ namespace {
- #if defined(OS_MACOSX)
- const int kDesiredSizes[] = {16, 32, 128, 256, 512};
- const size_t kNumDesiredSizes = arraysize(kDesiredSizes);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
- // that "Minimally you should install a 48x48 icon in the hicolor theme."
- const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
-@@ -443,7 +443,7 @@ bool IsValidUrl(const GURL& url) {
-   return false;
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- std::string GetWMClassFromAppName(std::string app_name) {
-   base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_');
-   base::TrimString(app_name, "_", &app_name);

www/chromium/patches/patch-chrome_browser_web_applications_web_app_h

@@ -1,13 +0,0 @@
-$OpenBSD: patch-chrome_browser_web_applications_web_app_h,v 1.17 2018/09/12 17:08:22 robert Exp $
-Index: chrome/browser/web_applications/web_app.h
---- chrome/browser/web_applications/web_app.h.orig
-+++ chrome/browser/web_applications/web_app.h
-@@ -176,7 +176,7 @@ void UpdateShortcutsForAllApps(Profile* profile, base:
- // Returns true if given url is a valid web app url.
- bool IsValidUrl(const GURL& url);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Windows that correspond to web apps need to have a deterministic (and
- // different) WMClass than normal chrome windows so the window manager groups
- // them as a separate application.

www/chromium/patches/patch-chrome_common_BUILD_gn

@@ -1,8 +1,8 @@
-$OpenBSD: patch-chrome_common_BUILD_gn,v 1.16 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_common_BUILD_gn,v 1.17 2018/11/04 12:33:24 robert Exp $
 Index: chrome/common/BUILD.gn
 --- chrome/common/BUILD.gn.orig
 +++ chrome/common/BUILD.gn
-@@ -295,6 +295,10 @@ static_library("common") {
+@@ -297,6 +297,10 @@ static_library("common") {
      public_deps += [ "//ppapi/shared_impl" ]
    }
  

www/chromium/patches/patch-chrome_common_chrome_features_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_common_chrome_features_cc,v 1.10 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_common_chrome_features_cc,v 1.11 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/common/chrome_features.cc
 --- chrome/common/chrome_features.cc.orig
 +++ chrome/common/chrome_features.cc
-@@ -90,7 +90,7 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
+@@ -86,7 +86,7 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
                                              base::FEATURE_ENABLED_BY_DEFAULT};
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  
@@ -12,7 +12,7 @@ Index: chrome/common/chrome_features.cc
  // Enables the Restart background mode optimization. When all Chrome UI is
  // closed and it goes in the background, allows to restart the browser to
  // discard memory.
-@@ -155,7 +155,7 @@ const base::Feature kThirdPartyModulesBlocking{
+@@ -157,7 +157,7 @@ const base::Feature kThirdPartyModulesBlocking{
      "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
  #endif
  
@@ -21,12 +21,12 @@ Index: chrome/common/chrome_features.cc
  // Enables the dual certificate verification trial feature.
  // https://crbug.com/649026
  const base::Feature kCertDualVerificationTrialFeature{
-@@ -365,7 +365,7 @@ const base::Feature kAcknowledgeNtpOverrideOnDeactivat
-     "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif
- 
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
- const base::Feature kWarnBeforeQuitting{"WarnBeforeQuitting",
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
- #endif
+@@ -210,7 +210,7 @@ const base::Feature kDesktopIOSPromotion{"DesktopIOSPr
+ // Enables or disables windowing related features for desktop PWAs.
+ const base::Feature kDesktopPWAWindowing {
+   "DesktopPWAWindowing",
+-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+       base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+       base::FEATURE_DISABLED_BY_DEFAULT

www/chromium/patches/patch-chrome_common_chrome_features_h

@@ -1,32 +1,23 @@
-$OpenBSD: patch-chrome_common_chrome_features_h,v 1.10 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_common_chrome_features_h,v 1.11 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/common/chrome_features.h
 --- chrome/common/chrome_features.h.orig
 +++ chrome/common/chrome_features.h
-@@ -52,7 +52,7 @@ extern const base::Feature kAsyncDns;
+@@ -60,7 +60,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kAutomaticTabDiscarding;
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  
 -#if defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kBackgroundModeAllowRestart;
  #endif  // defined(OS_WIN) || defined(OS_LINUX)
- 
-@@ -76,7 +76,7 @@ extern const base::Feature kDialogTouchBar;
+@@ -90,7 +90,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kTabStripKeyboardFocus;
  #endif  // defined(OS_MACOSX)
  
 -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kCertDualVerificationTrialFeature;
  #endif
- 
-@@ -201,7 +201,7 @@ extern const base::Feature kMacMaterialDesignDownloadS
- extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate;
- #endif
- 
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
- extern const base::Feature kWarnBeforeQuitting;
- #endif
- 

www/chromium/patches/patch-chrome_common_chrome_paths_cc

@@ -1,10 +1,10 @@
-$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.43 2018/08/10 14:57:53 robert Exp $
+$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.44 2018/11/04 12:33:24 robert Exp $
 Index: chrome/common/chrome_paths.cc
 --- chrome/common/chrome_paths.cc.orig
 +++ chrome/common/chrome_paths.cc
-@@ -52,20 +52,22 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
- const base::FilePath::CharType kInternalNaClPluginFileName[] =
-     FILE_PATH_LITERAL("internal-nacl-plugin");
+@@ -50,20 +50,22 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
+     FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
+ #endif
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
@@ -36,7 +36,7 @@ Index: chrome/common/chrome_paths.cc
        if (!GetUserDownloadsDirectorySafe(&cur))
          return false;
        break;
-@@ -422,7 +424,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -414,7 +416,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
  #endif
  #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
@@ -45,7 +45,7 @@ Index: chrome/common/chrome_paths.cc
      case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS:
        if (!base::PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
                                    &cur)) {
-@@ -472,7 +474,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -464,7 +466,7 @@ bool PathProvider(int key, base::FilePath* result) {
        if (!base::PathExists(cur))  // We don't want to create this
          return false;
        break;
@@ -54,7 +54,7 @@ Index: chrome/common/chrome_paths.cc
      case chrome::DIR_POLICY_FILES: {
  #if defined(GOOGLE_CHROME_BUILD)
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
-@@ -483,7 +485,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -475,7 +477,7 @@ bool PathProvider(int key, base::FilePath* result) {
      }
  #endif
  #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
@@ -63,7 +63,7 @@ Index: chrome/common/chrome_paths.cc
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
          return false;
-@@ -491,7 +493,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -483,7 +485,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -72,7 +72,7 @@ Index: chrome/common/chrome_paths.cc
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -526,7 +528,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -518,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) {
  #endif
        break;
  

www/chromium/patches/patch-chrome_common_chrome_paths_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.19 2018/01/30 07:57:25 robert Exp $
+$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.20 2018/11/04 12:33:24 robert Exp $
 Index: chrome/common/chrome_paths.h
 --- chrome/common/chrome_paths.h.orig
 +++ chrome/common/chrome_paths.h
@@ -20,7 +20,7 @@ Index: chrome/common/chrome_paths.h
    DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                         // definition manifest files that
                                         // describe extensions which are to be
-@@ -111,7 +111,7 @@ enum {
+@@ -110,7 +110,7 @@ enum {
    DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
                                               // supervised user whitelists are
                                               // installed.

www/chromium/patches/patch-chrome_common_chrome_switches_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.40 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.41 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/common/chrome_switches.cc
 --- chrome/common/chrome_switches.cc.orig
 +++ chrome/common/chrome_switches.cc
-@@ -987,12 +987,12 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
+@@ -992,12 +992,12 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
  const char kAllowNaClSocketAPI[]            = "allow-nacl-socket-api";
  #endif
  

www/chromium/patches/patch-chrome_common_chrome_switches_h

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.45 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.46 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/common/chrome_switches.h
 --- chrome/common/chrome_switches.h.orig
 +++ chrome/common/chrome_switches.h
-@@ -302,12 +302,12 @@ extern const char kAllowNaClFileHandleAPI[];
+@@ -303,12 +303,12 @@ extern const char kAllowNaClFileHandleAPI[];
  extern const char kAllowNaClSocketAPI[];
  #endif
  

www/chromium/patches/patch-chrome_common_extensions_chrome_extensions_client_cc

@@ -1,16 +0,0 @@
-$OpenBSD: patch-chrome_common_extensions_chrome_extensions_client_cc,v 1.8 2018/09/12 17:08:22 robert Exp $
-Index: chrome/common/extensions/chrome_extensions_client.cc
---- chrome/common/extensions/chrome_extensions_client.cc.orig
-+++ chrome/common/extensions/chrome_extensions_client.cc
-@@ -99,7 +99,10 @@ ChromeChannelForHistogram GetChromeChannelForHistogram
- static base::LazyInstance<ChromeExtensionsClient>::Leaky g_client =
-     LAZY_INSTANCE_INITIALIZER;
- 
--ChromeExtensionsClient::ChromeExtensionsClient() {}
-+ChromeExtensionsClient::ChromeExtensionsClient()
-+    : chrome_api_permissions_(ChromeAPIPermissions()),
-+      extensions_api_permissions_(ExtensionsAPIPermissions()) {
-+}
- 
- ChromeExtensionsClient::~ChromeExtensionsClient() {
- }

www/chromium/patches/patch-chrome_common_pref_names_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_common_pref_names_cc,v 1.46 2018/09/27 06:36:18 robert Exp $
+$OpenBSD: patch-chrome_common_pref_names_cc,v 1.47 2018/11/04 12:33:24 robert Exp $
 Index: chrome/common/pref_names.cc
 --- chrome/common/pref_names.cc.orig
 +++ chrome/common/pref_names.cc
-@@ -406,7 +406,7 @@ const char kSearchSuggestEnabled[] = "search.suggest_e
- const char kContextualSearchEnabled[] = "search.contextual_search_enabled";
+@@ -408,7 +408,7 @@ const char kContextualSearchDisabledValue[] = "false";
+ const char kContextualSearchEnabledValue[] = "true";
  #endif  // defined(OS_ANDROID)
  
 -#if defined(OS_MACOSX) || defined(OS_WIN) || \
@@ -11,16 +11,16 @@ Index: chrome/common/pref_names.cc
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  // Boolean that indicates whether the browser should put up a confirmation
  // window when the user is attempting to quit. Only on Mac, Windows, and Linux.
-@@ -918,7 +918,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe
- // See the SafeSitesFilterBehavior policy for details.
- const char kSafeSitesFilterBehavior[] = "settings.safe_sites_filter_behavior";
+@@ -936,7 +936,7 @@ const char kForceSessionSync[] = "settings.history_rec
+ // only using an account that belongs to one of the domains from this pref.
+ const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  // Linux specific preference on whether we should match the system theme.
  const char kUsesSystemTheme[] = "extensions.theme.use_system";
  #endif
-@@ -1001,7 +1001,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1024,7 +1024,7 @@ const char kShowUpdatePromotionInfoBar[] =
      "browser.show_update_promotion_info_bar";
  #endif
  
@@ -29,7 +29,7 @@ Index: chrome/common/pref_names.cc
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1363,7 +1363,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1413,7 +1413,7 @@ const char kDownloadDefaultDirectory[] = "download.def
  // upgrade a unsafe location to a safe location.
  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
  

www/chromium/patches/patch-chrome_common_pref_names_h

@@ -1,27 +1,27 @@
-$OpenBSD: patch-chrome_common_pref_names_h,v 1.45 2018/09/16 11:08:34 robert Exp $
+$OpenBSD: patch-chrome_common_pref_names_h,v 1.46 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/common/pref_names.h
 --- chrome/common/pref_names.h.orig
 +++ chrome/common/pref_names.h
-@@ -165,7 +165,7 @@ extern const char kSearchSuggestEnabled[];
- #if defined(OS_ANDROID)
- extern const char kContextualSearchEnabled[];
+@@ -167,7 +167,7 @@ extern const char kContextualSearchEnabled[];
+ extern const char kContextualSearchDisabledValue[];
+ extern const char kContextualSearchEnabledValue[];
  #endif  // defined(OS_ANDROID)
 -#if defined(OS_MACOSX) || defined(OS_WIN) || \
 +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  extern const char kConfirmToQuitEnabled[];
  #endif
-@@ -294,7 +294,7 @@ extern const char kForceYouTubeRestrict[];
+@@ -300,7 +300,7 @@ extern const char kForceGoogleSafeSearch[];
+ extern const char kForceYouTubeRestrict[];
  extern const char kForceSessionSync[];
  extern const char kAllowedDomainsForApps[];
- extern const char kSafeSitesFilterBehavior[];
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
-@@ -327,7 +327,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+@@ -333,7 +333,7 @@ extern const char kDefaultBrowserSettingEnabled[];
  #if defined(OS_MACOSX)
  extern const char kShowUpdatePromotionInfoBar[];
  #endif
@@ -30,7 +30,7 @@ Index: chrome/common/pref_names.h
  extern const char kUseCustomChromeFrame[];
  #endif
  #if BUILDFLAG(ENABLE_PLUGINS)
-@@ -474,7 +474,7 @@ extern const char kAppWindowPlacement[];
+@@ -490,7 +490,7 @@ extern const char kAppWindowPlacement[];
  extern const char kDownloadDefaultDirectory[];
  extern const char kDownloadExtensionsToOpen[];
  extern const char kDownloadDirUpgraded[];

www/chromium/patches/patch-chrome_common_webui_url_constants_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_common_webui_url_constants_cc,v 1.6 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_common_webui_url_constants_cc,v 1.7 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/common/webui_url_constants.cc
 --- chrome/common/webui_url_constants.cc.orig
 +++ chrome/common/webui_url_constants.cc
-@@ -237,7 +237,7 @@ const char kChromeUICastHost[] = "cast";
+@@ -242,7 +242,7 @@ const char kChromeUICastHost[] = "cast";
  const char kChromeUICastURL[] = "chrome://cast/";
  #endif
  
@@ -12,7 +12,7 @@ Index: chrome/common/webui_url_constants.cc
  const char kChromeUIDiscardsHost[] = "discards";
  const char kChromeUIDiscardsURL[] = "chrome://discards/";
  #endif
-@@ -246,11 +246,11 @@ const char kChromeUIDiscardsURL[] = "chrome://discards
+@@ -251,11 +251,11 @@ const char kChromeUIDiscardsURL[] = "chrome://discards
  const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
  #endif
  
@@ -26,7 +26,7 @@ Index: chrome/common/webui_url_constants.cc
  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
  #endif
  
-@@ -398,13 +398,13 @@ const char* const kChromeHostURLs[] = {
+@@ -407,13 +407,13 @@ const char* const kChromeHostURLs[] = {
      kChromeUIInternetDetailDialogHost,
      kChromeUIAssistantOptInHost,
  #endif

www/chromium/patches/patch-chrome_common_webui_url_constants_h

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_common_webui_url_constants_h,v 1.4 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chrome_common_webui_url_constants_h,v 1.5 2018/11/04 12:33:24 robert Exp $
 
 Index: chrome/common/webui_url_constants.h
 --- chrome/common/webui_url_constants.h.orig
 +++ chrome/common/webui_url_constants.h
-@@ -232,7 +232,7 @@ extern const char kChromeUICastHost[];
+@@ -237,7 +237,7 @@ extern const char kChromeUICastHost[];
  extern const char kChromeUICastURL[];
  #endif
  
@@ -12,7 +12,7 @@ Index: chrome/common/webui_url_constants.h
  extern const char kChromeUIDiscardsHost[];
  extern const char kChromeUIDiscardsURL[];
  #endif
-@@ -241,11 +241,11 @@ extern const char kChromeUIDiscardsURL[];
+@@ -246,11 +246,11 @@ extern const char kChromeUIDiscardsURL[];
  extern const char kChromeUILinuxProxyConfigHost[];
  #endif
  

www/chromium/patches/patch-chrome_renderer_chrome_content_renderer_client_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-chrome_renderer_chrome_content_renderer_client_cc,v 1.1 2018/11/04 12:33:24 robert Exp $
+
+Index: chrome/renderer/chrome_content_renderer_client.cc
+--- chrome/renderer/chrome_content_renderer_client.cc.orig
++++ chrome/renderer/chrome_content_renderer_client.cc
+@@ -1027,7 +1027,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+       }
+ 
+       case chrome::mojom::PluginStatus::kRestartRequired: {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+         placeholder = create_blocked_plugin(
+             IDR_BLOCKED_PLUGIN_HTML,
+             l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED,

www/chromium/patches/patch-chrome_service_cloud_print_print_system_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-chrome_service_cloud_print_print_system_cc,v 1.1 2018/11/04 12:33:24 robert Exp $
+
+Index: chrome/service/cloud_print/print_system.cc
+--- chrome/service/cloud_print/print_system.cc.orig
++++ chrome/service/cloud_print/print_system.cc
+@@ -36,7 +36,7 @@ std::string PrintSystem::GenerateProxyId() {
+   return base::GenerateGUID();
+ }
+ 
+-#if defined(OS_LINUX) && !defined(USE_CUPS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(USE_CUPS)
+ scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
+     const base::DictionaryValue*) {
+   return nullptr;

www/chromium/patches/patch-chromecast_browser_cast_browser_main_parts_cc

@@ -0,0 +1,32 @@
+$OpenBSD: patch-chromecast_browser_cast_browser_main_parts_cc,v 1.12 2018/11/04 12:33:24 robert Exp $
+
+Index: chromecast/browser/cast_browser_main_parts.cc
+--- chromecast/browser/cast_browser_main_parts.cc.orig
++++ chromecast/browser/cast_browser_main_parts.cc
+@@ -70,7 +70,7 @@
+ #include "ui/compositor/compositor_switches.h"
+ #include "ui/gl/gl_switches.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <fontconfig/fontconfig.h>
+ #include <signal.h>
+ #include <sys/prctl.h>
+@@ -243,7 +243,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+     {cc::switches::kDisableThreadedAnimation, ""},
+ #endif  // defined(OS_ANDROID)
+ #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(ARCH_CPU_X86_FAMILY)
+     // This is needed for now to enable the x11 Ozone platform to work with
+     // current Linux/NVidia OpenGL drivers.
+@@ -400,7 +400,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() 
+ }
+ 
+ void CastBrowserMainParts::ToolkitInitialized() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Without this call, the FontConfig library gets implicitly initialized
+   // on the first call to FontConfig. Since it's not safe to initialize it
+   // concurrently from multiple threads, we explicitly initialize it here

www/chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-chromecast_browser_cast_content_browser_client_cc,v 1.20 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-chromecast_browser_cast_content_browser_client_cc,v 1.21 2018/11/04 12:33:24 robert Exp $
 
 Index: chromecast/browser/cast_content_browser_client.cc
 --- chromecast/browser/cast_content_browser_client.cc.orig
 +++ chromecast/browser/cast_content_browser_client.cc
-@@ -426,7 +426,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -436,7 +436,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
                                            switches::kAudioOutputChannels));
      }
    } else if (process_type == switches::kGpuProcess) {

www/chromium/patches/patch-components_autofill_core_browser_autofill_experiments_cc

@@ -1,13 +1,41 @@
-$OpenBSD: patch-components_autofill_core_browser_autofill_experiments_cc,v 1.16 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-components_autofill_core_browser_autofill_experiments_cc,v 1.17 2018/11/04 12:33:24 robert Exp $
+
 Index: components/autofill/core/browser/autofill_experiments.cc
 --- components/autofill/core/browser/autofill_experiments.cc.orig
 +++ components/autofill/core/browser/autofill_experiments.cc
-@@ -109,7 +109,7 @@ bool IsAutofillCreditCardLocalCardMigrationExperimentE
+@@ -27,7 +27,7 @@
+ 
+ namespace autofill {
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ namespace {
+ // Returns the font weight corresponding to the value of param
+ // kAutofillForcedFontWeightParameterName, or kDefault if the param is not
+@@ -55,7 +55,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon
+ const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon";
+ #endif  // !defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ const base::Feature kAutofillPrimaryInfoStyleExperiment{
+     "AutofillPrimaryInfoStyleExperiment", base::FEATURE_DISABLED_BY_DEFAULT};
+ const char kAutofillForcedFontWeightParameterName[] = "font_weight";
+@@ -150,7 +150,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
  }
  
  bool OfferStoreUnmaskedCards() {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
    // The checkbox can be forced on with a flag, but by default we don't store
    // on Linux due to lack of system keychain integration. See crbug.com/162735
    return base::CommandLine::ForCurrentProcess()->HasSwitch(
+@@ -183,7 +183,7 @@ bool ShouldUseActiveSignedInAccount() {
+              features::kAutofillGetPaymentsIdentityFromSync);
+ }
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ ForcedFontWeight GetForcedFontWeight() {
+   if (!base::FeatureList::IsEnabled(kAutofillPrimaryInfoStyleExperiment))
+     return ForcedFontWeight::kDefault;

www/chromium/patches/patch-components_autofill_core_browser_autofill_experiments_h

@@ -0,0 +1,23 @@
+$OpenBSD: patch-components_autofill_core_browser_autofill_experiments_h,v 1.1 2018/11/04 12:33:24 robert Exp $
+
+Index: components/autofill/core/browser/autofill_experiments.h
+--- components/autofill/core/browser/autofill_experiments.h.orig
++++ components/autofill/core/browser/autofill_experiments.h
+@@ -30,7 +30,7 @@ extern const char kAutofillDropdownLayoutParameterLead
+ extern const char kAutofillDropdownLayoutParameterTrailingIcon[];
+ #endif  // !defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ extern const base::Feature kAutofillPrimaryInfoStyleExperiment;
+ extern const char kAutofillForcedFontWeightParameterName[];
+ extern const char kAutofillForcedFontWeightParameterMedium[];
+@@ -65,7 +65,7 @@ bool OfferStoreUnmaskedCards();
+ // Returns whether the account of the active signed-in user should be used.
+ bool ShouldUseActiveSignedInAccount();
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ enum class ForcedFontWeight {
+   kDefault,  // No change to the font weight.
+   kMedium,

www/chromium/patches/patch-components_autofill_core_common_autofill_features_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-components_autofill_core_common_autofill_features_cc,v 1.1 2018/11/04 12:33:24 robert Exp $
+
+Index: components/autofill/core/common/autofill_features.cc
+--- components/autofill/core/common/autofill_features.cc.orig
++++ components/autofill/core/common/autofill_features.cc
+@@ -355,7 +355,7 @@ bool IsMacViewsAutofillPopupExperimentEnabled() {
+ #endif  // defined(OS_MACOSX)
+ 
+ bool ShouldUseNativeViews() {
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   return base::FeatureList::IsEnabled(kAutofillExpandedPopupViews) ||
+          base::FeatureList::IsEnabled(::features::kExperimentalUi);
+ #else

www/chromium/patches/patch-components_autofill_core_common_autofill_util_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-components_autofill_core_common_autofill_util_cc,v 1.1 2018/11/04 12:33:24 robert Exp $
+
+Index: components/autofill/core/common/autofill_util.cc
+--- components/autofill/core/common/autofill_util.cc.orig
++++ components/autofill/core/common/autofill_util.cc
+@@ -202,7 +202,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value
+ }
+ 
+ bool ShouldAutoselectFirstSuggestionOnArrowDown() {
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   return true;
+ #else
+   return false;

www/chromium/patches/patch-components_autofill_strings_grdp

@@ -1,32 +1,14 @@
-$OpenBSD: patch-components_autofill_strings_grdp,v 1.7 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-components_autofill_strings_grdp,v 1.8 2018/11/04 12:33:24 robert Exp $
 
 Index: components/autofill_strings.grdp
 --- components/autofill_strings.grdp.orig
 +++ components/autofill_strings.grdp
-@@ -183,7 +183,7 @@
-   <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_CONFIRM" desc="Text to show for the Autofill upload save credit card prompt accept button when more information (e.g., CVC) was needed in order to save the card and was entered.">
-     Confirm
+@@ -198,7 +198,7 @@
+   <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL" desc="Title text for the Autofill save card prompt when the card is to be saved locally. The prompt can be either a bubble or an infobar.">
+     Save card?
    </message>
 -  <if expr="is_linux and not chromeos">
 +  <if expr="is_posix and not chromeos">
      <then>
        <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
          Do you want to save this card to your Google Account?
-@@ -201,7 +201,7 @@
-   <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION" desc="Explanation of the effect of the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
-     Pay quickly on sites and apps across devices using cards you have saved with Google.
-   </message>
--  <if expr="is_linux and not chromeos">
-+  <if expr="is_posix and not chromeos">
-     <then>
-       <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_V2" desc="Explanation of the effect of the Autofill save card prompt when the card is to be saved by uploading it to Google Payments, according to June 2017 UI guidelines. The prompt will be shown in a bubble below the omnibox.">
-         To pay faster next time, save this card to your Google Account.
-@@ -213,7 +213,7 @@
-       </message>
-     </else>
-   </if>
--  <if expr="is_linux and not chromeos">
-+  <if expr="is_posix and not chromeos">
-     <then>
-       <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_V3" desc="Explanation of the effect of the Autofill save card prompt when the card is to be saved by uploading it to Google Payments, according to April 2018 UI guidelines. The prompt will be shown in a bubble below the omnibox.">
-         To pay faster next time, save your card and billing address to your Google Account.

www/chromium/patches/patch-components_crash_content_app_BUILD_gn

@@ -1,4 +1,4 @@
-$OpenBSD: patch-components_crash_content_app_BUILD_gn,v 1.13 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-components_crash_content_app_BUILD_gn,v 1.14 2018/11/04 12:33:24 robert Exp $
 
 Index: components/crash/content/app/BUILD.gn
 --- components/crash/content/app/BUILD.gn.orig
@@ -19,4 +19,4 @@ Index: components/crash/content/app/BUILD.gn
 -      "//third_party/breakpad:client",
        "//third_party/crashpad/crashpad/snapshot",
      ]
- 
+   }

www/chromium/patches/patch-components_crash_content_browser_BUILD_gn

@@ -1,9 +1,9 @@
-$OpenBSD: patch-components_crash_content_browser_BUILD_gn,v 1.6 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-components_crash_content_browser_BUILD_gn,v 1.7 2018/11/04 12:33:24 robert Exp $
 
 Index: components/crash/content/browser/BUILD.gn
 --- components/crash/content/browser/BUILD.gn.orig
 +++ components/crash/content/browser/BUILD.gn
-@@ -26,10 +26,9 @@ source_set("browser") {
+@@ -28,10 +28,9 @@ source_set("browser") {
      "//components/crash/content/app",
      "//content/public/browser",
      "//content/public/common",
@@ -15,7 +15,7 @@ Index: components/crash/content/browser/BUILD.gn
      set_sources_assignment_filter([])
  
      # Want this file on both Linux and Android.
-@@ -45,7 +44,7 @@ source_set("browser") {
+@@ -47,7 +46,7 @@ source_set("browser") {
  
    # This is not in the GYP build but this target includes breakpad client
    # headers, so add the dependency here.

www/chromium/patches/patch-components_download_internal_common_base_file_cc

@@ -0,0 +1,14 @@
+$OpenBSD: patch-components_download_internal_common_base_file_cc,v 1.1 2018/11/04 12:33:24 robert Exp $
+
+Index: components/download/internal/common/base_file.cc
+--- components/download/internal/common/base_file.cc.orig
++++ components/download/internal/common/base_file.cc
+@@ -446,7 +446,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason(
+   return reason;
+ }
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ namespace {
+ 

www/chromium/patches/patch-components_metrics_BUILD_gn

@@ -1,8 +1,8 @@
-$OpenBSD: patch-components_metrics_BUILD_gn,v 1.11 2018/07/30 15:28:28 robert Exp $
+$OpenBSD: patch-components_metrics_BUILD_gn,v 1.12 2018/11/04 12:33:24 robert Exp $
 Index: components/metrics/BUILD.gn
 --- components/metrics/BUILD.gn.orig
 +++ components/metrics/BUILD.gn
-@@ -119,6 +119,10 @@ static_library("metrics") {
+@@ -118,6 +118,10 @@ static_library("metrics") {
      "//third_party/zlib/google:compression_utils",
    ]
  

www/chromium/patches/patch-components_neterror_resources_neterror_js

@@ -1,8 +1,8 @@
-$OpenBSD: patch-components_neterror_resources_neterror_js,v 1.5 2018/06/02 17:19:23 robert Exp $
+$OpenBSD: patch-components_neterror_resources_neterror_js,v 1.6 2018/11/04 12:33:24 robert Exp $
 Index: components/neterror/resources/neterror.js
 --- components/neterror/resources/neterror.js.orig
 +++ components/neterror/resources/neterror.js
-@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings) {
+@@ -155,7 +155,7 @@ function setUpCachedButton(buttonStrings) {
  }
  
  var primaryControlOnLeft = true;

www/chromium/patches/patch-components_network_session_configurator_browser_network_session_configurator_cc

@@ -1,9 +1,9 @@
-$OpenBSD: patch-components_network_session_configurator_browser_network_session_configurator_cc,v 1.7 2018/09/12 17:08:22 robert Exp $
+$OpenBSD: patch-components_network_session_configurator_browser_network_session_configurator_cc,v 1.8 2018/11/04 12:33:24 robert Exp $
 
 Index: components/network_session_configurator/browser/network_session_configurator.cc
 --- components/network_session_configurator/browser/network_session_configurator.cc.orig
 +++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -591,7 +591,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -618,7 +618,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
    }
  #endif  // #if !defined(OS_ANDROID)
  

www/chromium/patches/patch-components_new_or_sad_tab_strings_grdp

@@ -1,4 +1,4 @@
-$OpenBSD: patch-components_new_or_sad_tab_strings_grdp,v 1.4 2018/06/02 17:19:23 robert Exp $
+$OpenBSD: patch-components_new_or_sad_tab_strings_grdp,v 1.5 2018/11/04 12:33:24 robert Exp $
 
 Index: components/new_or_sad_tab_strings.grdp
 --- components/new_or_sad_tab_strings.grdp.orig
@@ -12,7 +12,7 @@ Index: components/new_or_sad_tab_strings.grdp
          <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode.">
            Open page in a new Incognito window (Ctrl-Shift-N)
          </message>
-@@ -66,7 +66,7 @@
+@@ -69,7 +69,7 @@
            Close other tabs or apps
          </message>
        </if>
@@ -21,7 +21,7 @@ Index: components/new_or_sad_tab_strings.grdp
          <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
            Close other tabs or programs
          </message>
-@@ -76,7 +76,7 @@
+@@ -79,7 +79,7 @@
            Close other apps
          </message>
        </if>
@@ -30,7 +30,7 @@ Index: components/new_or_sad_tab_strings.grdp
          <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
            Close other programs
          </message>
-@@ -91,7 +91,7 @@
+@@ -94,7 +94,7 @@
            Restart Chromium
          </message>
        </if>