BASELINE: Update Chromium to 98.0.4758.90

Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-02-04 17:20:24 +0100
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-02-12 08:15:25 +0000
commit: 8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch)
tree: 788d8d7549712682703a0310ca4a0f0860d4802b /chromium/ppapi
parent: 606d85f2a5386472314d39923da28c70c60dc8e7 (diff)
download: qtwebengine-chromium-8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b.tar.gz
166 files changed, 204 insertions, 463 deletions
diff --git a/chromium/ppapi/BUILD.gn b/chromium/ppapi/BUILD.gn
index b37a1efa2d0..c2dab92d233 100644
--- a/chromium/ppapi/BUILD.gn
+++ b/chromium/ppapi/BUILD.gn
@@ -421,10 +421,5 @@ if (enable_nacl) {
       data_deps +=
           [ ":ppapi_nacl_tests(//build/toolchain/nacl:glibc_${target_cpu})" ]
     }
-
-    if ((is_linux || is_chromeos) && enable_nacl_nonsfi) {
-      data_deps +=
-          [ ":ppapi_nacl_tests(//build/toolchain/nacl:newlib_pnacl_nonsfi)" ]
-    }
   }
 }
diff --git a/chromium/ppapi/api/private/ppb_isolated_file_system_private.idl b/chromium/ppapi/api/private/ppb_isolated_file_system_private.idl
index c42d5201236..355a3681688 100644
--- a/chromium/ppapi/api/private/ppb_isolated_file_system_private.idl
+++ b/chromium/ppapi/api/private/ppb_isolated_file_system_private.idl
@@ -22,9 +22,7 @@ enum PP_IsolatedFileSystemType_Private {
   /** Type for invalid file systems */
   PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID = 0,
   /** Type for CRX file systems */
-  PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX = 1,
-  /** Type for PluginPrivate file systems */
-  PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE = 2
+  PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX = 1
 };
 
 /* <code>PPB_IsolatedFileSystem_Private</code> interface */
diff --git a/chromium/ppapi/c/private/ppb_isolated_file_system_private.h b/chromium/ppapi/c/private/ppb_isolated_file_system_private.h
index 410108b8cb9..9ae954f8c5a 100644
--- a/chromium/ppapi/c/private/ppb_isolated_file_system_private.h
+++ b/chromium/ppapi/c/private/ppb_isolated_file_system_private.h
@@ -38,9 +38,7 @@ typedef enum {
   /** Type for invalid file systems */
   PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID = 0,
   /** Type for CRX file systems */
-  PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX = 1,
-  /** Type for PluginPrivate file systems */
-  PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE = 2
+  PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX = 1
 } PP_IsolatedFileSystemType_Private;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_IsolatedFileSystemType_Private, 4);
 /**
diff --git a/chromium/ppapi/host/instance_message_filter.h b/chromium/ppapi/host/instance_message_filter.h
index f2586299710..339776521d2 100644
--- a/chromium/ppapi/host/instance_message_filter.h
+++ b/chromium/ppapi/host/instance_message_filter.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_HOST_INSTANCE_MESSAGE_FILTER_H_
 #define PPAPI_HOST_INSTANCE_MESSAGE_FILTER_H_
 
-#include "base/macros.h"
 #include "ppapi/host/ppapi_host_export.h"
 
 namespace IPC {
diff --git a/chromium/ppapi/host/message_filter_host.h b/chromium/ppapi/host/message_filter_host.h
index 9538ed1e801..2790ef11275 100644
--- a/chromium/ppapi/host/message_filter_host.h
+++ b/chromium/ppapi/host/message_filter_host.h
@@ -6,7 +6,6 @@
 #define PPAPI_HOST_MESSAGE_FILTER_HOST_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/host/ppapi_host_export.h"
 #include "ppapi/host/resource_host.h"
diff --git a/chromium/ppapi/host/ppapi_host.h b/chromium/ppapi/host/ppapi_host.h
index 42559fabd01..0531c3accf9 100644
--- a/chromium/ppapi/host/ppapi_host.h
+++ b/chromium/ppapi/host/ppapi_host.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/observer_list.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
diff --git a/chromium/ppapi/host/resource_host.h b/chromium/ppapi/host/resource_host.h
index 83b5bf3ba5c..87cac758416 100644
--- a/chromium/ppapi/host/resource_host.h
+++ b/chromium/ppapi/host/resource_host.h
@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/host/ppapi_host_export.h"
diff --git a/chromium/ppapi/host/resource_message_filter.cc b/chromium/ppapi/host/resource_message_filter.cc
index 8583e0bf96f..d560449cd0b 100644
--- a/chromium/ppapi/host/resource_message_filter.cc
+++ b/chromium/ppapi/host/resource_message_filter.cc
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "base/sequenced_task_runner.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/chromium/ppapi/host/resource_message_filter.h b/chromium/ppapi/host/resource_message_filter.h
index 43ffcd8fb9c..1352a1bd780 100644
--- a/chromium/ppapi/host/resource_message_filter.h
+++ b/chromium/ppapi/host/resource_message_filter.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_HOST_RESOURCE_MESSAGE_FILTER_H_
 #define PPAPI_HOST_RESOURCE_MESSAGE_FILTER_H_
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/host/host_message_context.h"
@@ -93,6 +92,9 @@ class PPAPI_HOST_EXPORT ResourceMessageFilter
   ResourceMessageFilter(
       scoped_refptr<base::SingleThreadTaskRunner> reply_thread_task_runner);
 
+  ResourceMessageFilter(const ResourceMessageFilter&) = delete;
+  ResourceMessageFilter& operator=(const ResourceMessageFilter&) = delete;
+
   // Called when a filter is added to a ResourceHost.
   void OnFilterAdded(ResourceHost* resource_host);
   // Called when a filter is removed from a ResourceHost.
@@ -143,8 +145,6 @@ class PPAPI_HOST_EXPORT ResourceMessageFilter
   // ResourceHost when |OnFilterAdded| is called. When the owning ResourceHost
   // is destroyed, |OnFilterDestroyed| is called and this will be set to NULL.
   ResourceHost* resource_host_;
-
-  DISALLOW_COPY_AND_ASSIGN(ResourceMessageFilter);
 };
 
 }  // namespace host
diff --git a/chromium/ppapi/host/resource_message_filter_unittest.cc b/chromium/ppapi/host/resource_message_filter_unittest.cc
index 98929b84063..7f804df32a1 100644
--- a/chromium/ppapi/host/resource_message_filter_unittest.cc
+++ b/chromium/ppapi/host/resource_message_filter_unittest.cc
@@ -8,8 +8,8 @@
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/test/task_environment.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
diff --git a/chromium/ppapi/host/resource_message_handler.h b/chromium/ppapi/host/resource_message_handler.h
index 375fdecb9c0..c4a72eb1e77 100644
--- a/chromium/ppapi/host/resource_message_handler.h
+++ b/chromium/ppapi/host/resource_message_handler.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_HOST_RESOURCE_MESSAGE_HANDLER_H_
 #define PPAPI_HOST_RESOURCE_MESSAGE_HANDLER_H_
 
-#include "base/macros.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/host/ppapi_host_export.h"
 
diff --git a/chromium/ppapi/nacl_irt/irt_pnacl_translator_compile.cc b/chromium/ppapi/nacl_irt/irt_pnacl_translator_compile.cc
index a2db35b7c40..b78ae2f8362 100644
--- a/chromium/ppapi/nacl_irt/irt_pnacl_translator_compile.cc
+++ b/chromium/ppapi/nacl_irt/irt_pnacl_translator_compile.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/task/single_thread_task_executor.h"
 #include "build/build_config.h"
@@ -26,6 +25,10 @@ class TranslatorCompileListener : public IPC::Listener {
     CHECK(channel_->Connect());
   }
 
+  TranslatorCompileListener(const TranslatorCompileListener&) = delete;
+  TranslatorCompileListener& operator=(const TranslatorCompileListener&) =
+      delete;
+
   // Needed for handling sync messages in OnMessageReceived().
   bool Send(IPC::Message* message) {
     return channel_->Send(message);
@@ -96,8 +99,6 @@ class TranslatorCompileListener : public IPC::Listener {
 
   std::unique_ptr<IPC::Channel> channel_;
   const struct nacl_irt_pnacl_compile_funcs* funcs_;
-
-  DISALLOW_COPY_AND_ASSIGN(TranslatorCompileListener);
 };
 
 void ServeTranslateRequest(const struct nacl_irt_pnacl_compile_funcs* funcs) {
diff --git a/chromium/ppapi/nacl_irt/irt_pnacl_translator_link.cc b/chromium/ppapi/nacl_irt/irt_pnacl_translator_link.cc
index 57073fb2203..ff0240dd623 100644
--- a/chromium/ppapi/nacl_irt/irt_pnacl_translator_link.cc
+++ b/chromium/ppapi/nacl_irt/irt_pnacl_translator_link.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/task/single_thread_task_executor.h"
 #include "build/build_config.h"
@@ -30,6 +29,9 @@ class TranslatorLinkListener : public IPC::Listener {
     CHECK(channel_->Connect());
   }
 
+  TranslatorLinkListener(const TranslatorLinkListener&) = delete;
+  TranslatorLinkListener& operator=(const TranslatorLinkListener&) = delete;
+
   // Needed for handling sync messages in OnMessageReceived().
   bool Send(IPC::Message* message) {
     return channel_->Send(message);
@@ -67,8 +69,6 @@ class TranslatorLinkListener : public IPC::Listener {
 
   std::unique_ptr<IPC::Channel> channel_;
   CallbackFunc func_;
-
-  DISALLOW_COPY_AND_ASSIGN(TranslatorLinkListener);
 };
 
 void ServeLinkRequest(CallbackFunc func) {
diff --git a/chromium/ppapi/nacl_irt/manifest_service.cc b/chromium/ppapi/nacl_irt/manifest_service.cc
index 8a509191b95..94a97b4432c 100644
--- a/chromium/ppapi/nacl_irt/manifest_service.cc
+++ b/chromium/ppapi/nacl_irt/manifest_service.cc
@@ -6,8 +6,7 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
@@ -36,6 +35,9 @@ class ManifestMessageFilter : public IPC::SyncMessageFilter {
         connected_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                          base::WaitableEvent::InitialState::NOT_SIGNALED) {}
 
+  ManifestMessageFilter(const ManifestMessageFilter&) = delete;
+  ManifestMessageFilter& operator=(const ManifestMessageFilter&) = delete;
+
   bool Send(IPC::Message* message) override {
     // Wait until set up is actually done.
     connected_event_.Wait();
@@ -63,8 +65,6 @@ class ManifestMessageFilter : public IPC::SyncMessageFilter {
 
  private:
   base::WaitableEvent connected_event_;
-
-  DISALLOW_COPY_AND_ASSIGN(ManifestMessageFilter);
 };
 
 ManifestService::ManifestService(
diff --git a/chromium/ppapi/nacl_irt/manifest_service.h b/chromium/ppapi/nacl_irt/manifest_service.h
index c9251ca0f4b..cdaf6dc8d4f 100644
--- a/chromium/ppapi/nacl_irt/manifest_service.h
+++ b/chromium/ppapi/nacl_irt/manifest_service.h
@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 
diff --git a/chromium/ppapi/nacl_irt/plugin_startup.cc b/chromium/ppapi/nacl_irt/plugin_startup.cc
index 054502ec47e..334984c602f 100644
--- a/chromium/ppapi/nacl_irt/plugin_startup.cc
+++ b/chromium/ppapi/nacl_irt/plugin_startup.cc
@@ -9,8 +9,8 @@
 #include "base/file_descriptor_posix.h"
 #include "base/location.h"
 #include "base/message_loop/message_pump_type.h"
-#include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ppapi/nacl_irt/manifest_service.h"
diff --git a/chromium/ppapi/nacl_irt/ppapi_dispatcher.cc b/chromium/ppapi/nacl_irt/ppapi_dispatcher.cc
index d10ae080c62..c94e5bbdb13 100644
--- a/chromium/ppapi/nacl_irt/ppapi_dispatcher.cc
+++ b/chromium/ppapi/nacl_irt/ppapi_dispatcher.cc
@@ -13,8 +13,8 @@
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/memory/ref_counted.h"
-#include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/task/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_logging.h"
diff --git a/chromium/ppapi/native_client/nacl_test_data.gni b/chromium/ppapi/native_client/nacl_test_data.gni
index fc3b13486e1..d1791218c0a 100644
--- a/chromium/ppapi/native_client/nacl_test_data.gni
+++ b/chromium/ppapi/native_client/nacl_test_data.gni
@@ -9,11 +9,7 @@ import("//components/nacl/features.gni")
 assert(enable_nacl)
 
 if (current_cpu == "pnacl") {
-  if (is_nacl_nonsfi) {
-    nacl_toolchain_variant = "nonsfi"
-  } else {
-    nacl_toolchain_variant = "pnacl"
-  }
+  nacl_toolchain_variant = "pnacl"
 } else if (is_nacl_glibc) {
   nacl_toolchain_variant = "glibc"
 } else {
@@ -60,7 +56,7 @@ template("nacl_test_data") {
     if (defined(invoker.pretranslate_pexe)) {
       pretranslate_pexe = invoker.pretranslate_pexe
     } else {
-      pretranslate_pexe = is_nacl_nonsfi
+      pretranslate_pexe = false
     }
   } else {
     pretranslate_pexe = false
@@ -70,7 +66,7 @@ template("nacl_test_data") {
   # toolchain context where is_win==false because current_os=="nacl".
   # It tests target_cpu rather than current_cpu because it's also
   # needed in the current_cpu=="pnacl" && pretranslate_pexe case.
-  if (target_os == "win" && target_cpu == "x86" && !is_nacl_nonsfi &&
+  if (target_os == "win" && target_cpu == "x86" &&
       (current_cpu == "x86" || pretranslate_pexe)) {
     # x86 Windows builds of Chrome run on both x86 Windows and x64
     # Windows.  On x64 Windows, only x64 NaCl is supported, so those
@@ -119,7 +115,7 @@ template("nacl_test_data") {
   }
   nexe_target_name = target_name + "_nexe"
   nexe_copy_target_name = target_name + "_copy_nexe"
-  if (current_cpu == "pnacl" && !is_nacl_nonsfi) {
+  if (current_cpu == "pnacl") {
     if (defined(invoker.debug_pexe) && invoker.debug_pexe) {
       pexe_copy_debug_target_name = target_name + "_copy_pexe_debug"
     }
@@ -147,11 +143,7 @@ template("nacl_test_data") {
   } else {
     target_dir = root_build_dir
     if (generate_nmf) {
-      if (is_nacl_nonsfi) {
-        nacl_toolchain_name = "pnacl_${nacl_toolchain_variant}"
-      } else {
-        nacl_toolchain_name = nacl_toolchain_variant
-      }
+      nacl_toolchain_name = nacl_toolchain_variant
       nmf_name = "${output_name}_${nacl_toolchain_name}"
     }
   }
@@ -162,6 +154,7 @@ template("nacl_test_data") {
     sources = invoker.sources
     forward_variables_from(invoker,
                            [
+                             "assert_no_deps",
                              "cflags",
                              "defines",
                              "include_dirs",
@@ -194,53 +187,35 @@ template("nacl_test_data") {
 
         pexe = get_label_info(tests, "root_out_dir") +
                "/${suffixed_output_name}.pexe"
-        if (translate_cpu == "x86" ||
-            (is_nacl_nonsfi &&
-             (translate_cpu == "x86" || translate_cpu == "x64"))) {
+        if (translate_cpu == "x86") {
           nmf_cpu = "x32"
         } else {
           nmf_cpu = translate_cpu
         }
-        if (is_nacl_nonsfi) {
-          suffix = "pnacl_newlib_${nmf_cpu}_nonsfi"
-        } else {
-          suffix = "pnacl_newlib_${nmf_cpu}"
-        }
+        suffix = "pnacl_newlib_${nmf_cpu}"
         nexe = "${root_out_dir}/${output_name}_${suffix}.nexe"
 
         script = "${nacl_toolchain_bindir}/pydir/loader.py"
         sources = [ pexe ]
         outputs = [ nexe ]
 
-        if (is_nacl_nonsfi) {
-          if (translate_cpu == "x86" || translate_cpu == "x64") {
-            arch = "x86-32-nonsfi"
-          } else if (translate_cpu == "arm") {
-            arch = "arm-nonsfi"
-          }
-        } else {
-          # TODO(phosek): remove the following once change 1360243003 is rolled
-          # into Chrome and use translate_cpu directly.
-          if (translate_cpu == "x86") {
-            arch = "i686"
-          } else if (translate_cpu == "x64") {
-            arch = "x86-64"
-          } else if (translate_cpu == "arm") {
-            arch = "armv7"
-          } else if (translate_cpu == "mipsel") {
-            arch = "mipsel"
-          }
+        # TODO(phosek): remove the following once change 1360243003 is rolled
+        # into Chrome and use translate_cpu directly.
+        if (translate_cpu == "x86") {
+          arch = "i686"
+        } else if (translate_cpu == "x64") {
+          arch = "x86-64"
+        } else if (translate_cpu == "arm") {
+          arch = "armv7"
+        } else if (translate_cpu == "mipsel") {
+          arch = "mipsel"
         }
 
         # The pre-translated object file has to be linked with an IRT shim to
         # get a runnable nexe. This is handled by pnacl-translate, which passes
         # -l:libpnacl_irt_shim.a to native linker, and we need to ensure the
         # linker can find the correct library.
-        if (is_nacl_nonsfi) {
-          pnacl_irt_shim = "//ppapi/native_client/src/untrusted/pnacl_irt_shim:aot(//build/toolchain/nacl:newlib_pnacl_nonsfi)"
-        } else {
-          pnacl_irt_shim = "//ppapi/native_client/src/untrusted/pnacl_irt_shim:aot(//build/toolchain/nacl:clang_newlib_${translate_cpu})"
-        }
+        pnacl_irt_shim = "//ppapi/native_client/src/untrusted/pnacl_irt_shim:aot(//build/toolchain/nacl:clang_newlib_${translate_cpu})"
 
         args = [
           "pnacl-translate",
@@ -309,7 +284,7 @@ template("nacl_test_data") {
     }
   }
 
-  if (current_cpu == "pnacl" && !is_nacl_nonsfi) {
+  if (current_cpu == "pnacl") {
     if (defined(invoker.debug_pexe) && invoker.debug_pexe) {
       copy(pexe_copy_debug_target_name) {
         visibility = [ ":$final_target_name" ]
@@ -322,27 +297,16 @@ template("nacl_test_data") {
   }
 
   if (generate_nmf) {
-    if (is_nacl_nonsfi) {
-      generate_nonsfi_test_nmf(nmf_target_name) {
-        visibility = [ ":$final_target_name" ]
-        forward_variables_from(invoker, [ "nmfflags" ])
-        nmf = "${target_dir}/${nmf_name}.nmf"
-        files = get_target_outputs(":$nexe_copy_target_name")
-        executable = files[0]
-        deps = [ ":$nexe_copy_target_name" ]
-      }
-    } else {
-      generate_nmf(nmf_target_name) {
-        visibility = [ ":$final_target_name" ]
-        forward_variables_from(invoker, [ "nmfflags" ])
-        nmf = "${target_dir}/${nmf_name}.nmf"
-        executables = get_target_outputs(":$nexe_copy_target_name")
-        if (is_nacl_glibc) {
-          lib_prefix = "${output_name}_libs"
-          stage_dependencies = target_dir
-        }
-        deps = [ ":$nexe_copy_target_name" ]
+    generate_nmf(nmf_target_name) {
+      visibility = [ ":$final_target_name" ]
+      forward_variables_from(invoker, [ "nmfflags" ])
+      nmf = "${target_dir}/${nmf_name}.nmf"
+      executables = get_target_outputs(":$nexe_copy_target_name")
+      if (is_nacl_glibc) {
+        lib_prefix = "${output_name}_libs"
+        stage_dependencies = target_dir
       }
+      deps = [ ":$nexe_copy_target_name" ]
     }
   }
 
@@ -356,7 +320,7 @@ template("nacl_test_data") {
 
   group(final_target_name) {
     data_deps = [ ":$nexe_copy_target_name" ]
-    if (current_cpu == "pnacl" && !is_nacl_nonsfi) {
+    if (current_cpu == "pnacl") {
       if (defined(invoker.debug_pexe) && invoker.debug_pexe) {
         data_deps += [ ":$pexe_copy_debug_target_name" ]
       }
diff --git a/chromium/ppapi/proxy/BUILD.gn b/chromium/ppapi/proxy/BUILD.gn
index 4420050073d..13e2afebda3 100644
--- a/chromium/ppapi/proxy/BUILD.gn
+++ b/chromium/ppapi/proxy/BUILD.gn
@@ -241,6 +241,7 @@ component("proxy") {
     "//mojo/core/embedder",
     "//ppapi/c",
     "//ppapi/shared_impl",
+    "//third_party/icu",
     "//ui/gfx/geometry",
     "//ui/gfx/ipc/geometry",
   ]
@@ -254,10 +255,6 @@ component("proxy") {
       "//ui/surface",
     ]
   }
-
-  if (!is_nacl_nonsfi) {
-    deps += [ "//third_party/icu" ]
-  }
 }
 
 source_set("common") {
diff --git a/chromium/ppapi/proxy/audio_buffer_resource.h b/chromium/ppapi/proxy/audio_buffer_resource.h
index 1e03dea1017..c55d17aef1c 100644
--- a/chromium/ppapi/proxy/audio_buffer_resource.h
+++ b/chromium/ppapi/proxy/audio_buffer_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_audio_buffer_api.h"
diff --git a/chromium/ppapi/proxy/audio_input_resource.h b/chromium/ppapi/proxy/audio_input_resource.h
index 84e5401ad58..b321cb97b61 100644
--- a/chromium/ppapi/proxy/audio_input_resource.h
+++ b/chromium/ppapi/proxy/audio_input_resource.h
@@ -11,7 +11,6 @@
 #include <memory>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/read_only_shared_memory_region.h"
 #include "base/memory/ref_counted.h"
 #include "base/sync_socket.h"
diff --git a/chromium/ppapi/proxy/audio_output_resource.h b/chromium/ppapi/proxy/audio_output_resource.h
index 1b901c6ad68..e24c808ed8f 100644
--- a/chromium/ppapi/proxy/audio_output_resource.h
+++ b/chromium/ppapi/proxy/audio_output_resource.h
@@ -11,7 +11,6 @@
 #include <memory>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/sync_socket.h"
diff --git a/chromium/ppapi/proxy/browser_font_singleton_resource.h b/chromium/ppapi/proxy/browser_font_singleton_resource.h
index 838d28cc9e8..63af1bb1e47 100644
--- a/chromium/ppapi/proxy/browser_font_singleton_resource.h
+++ b/chromium/ppapi/proxy/browser_font_singleton_resource.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_BROWSER_FONT_SINGLETON_RESOURCE_H_
 #define PPAPI_PROXY_BROWSER_FONT_SINGLETON_RESOURCE_H_
 
-#include "base/macros.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/thunk/ppb_browser_font_singleton_api.h"
diff --git a/chromium/ppapi/proxy/camera_capabilities_resource.h b/chromium/ppapi/proxy/camera_capabilities_resource.h
index b491369d0f4..2ac08803801 100644
--- a/chromium/ppapi/proxy/camera_capabilities_resource.h
+++ b/chromium/ppapi/proxy/camera_capabilities_resource.h
@@ -11,7 +11,6 @@
 #include <memory>
 #include <vector>
 
-#include "base/macros.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_camera_capabilities_api.h"
diff --git a/chromium/ppapi/proxy/camera_device_resource.h b/chromium/ppapi/proxy/camera_device_resource.h
index fa8df1afd59..604bdccd523 100644
--- a/chromium/ppapi/proxy/camera_device_resource.h
+++ b/chromium/ppapi/proxy/camera_device_resource.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/private/pp_video_capture_format.h"
 #include "ppapi/proxy/connection.h"
diff --git a/chromium/ppapi/proxy/device_enumeration_resource_helper.h b/chromium/ppapi/proxy/device_enumeration_resource_helper.h
index 9380ad251e5..295b75d0914 100644
--- a/chromium/ppapi/proxy/device_enumeration_resource_helper.h
+++ b/chromium/ppapi/proxy/device_enumeration_resource_helper.h
@@ -10,7 +10,6 @@
 #include <memory>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/c/dev/ppb_device_ref_dev.h"
diff --git a/chromium/ppapi/proxy/device_enumeration_resource_helper_unittest.cc b/chromium/ppapi/proxy/device_enumeration_resource_helper_unittest.cc
index 3bfe5e8e617..ec18f3fe728 100644
--- a/chromium/ppapi/proxy/device_enumeration_resource_helper_unittest.cc
+++ b/chromium/ppapi/proxy/device_enumeration_resource_helper_unittest.cc
@@ -6,7 +6,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/device_enumeration_resource_helper.h"
diff --git a/chromium/ppapi/proxy/dispatcher.h b/chromium/ppapi/proxy/dispatcher.h
index e783f7cfa11..d02eb511ae4 100644
--- a/chromium/ppapi/proxy/dispatcher.h
+++ b/chromium/ppapi/proxy/dispatcher.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ipc/message_filter.h"
 #include "ppapi/c/pp_instance.h"
diff --git a/chromium/ppapi/proxy/file_chooser_resource.h b/chromium/ppapi/proxy/file_chooser_resource.h
index 5d4f332832e..12e1c31c37e 100644
--- a/chromium/ppapi/proxy/file_chooser_resource.h
+++ b/chromium/ppapi/proxy/file_chooser_resource.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/containers/queue.h"
-#include "base/macros.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/array_writer.h"
diff --git a/chromium/ppapi/proxy/file_io_resource.cc b/chromium/ppapi/proxy/file_io_resource.cc
index b77897d7d32..56e997b8811 100644
--- a/chromium/ppapi/proxy/file_io_resource.cc
+++ b/chromium/ppapi/proxy/file_io_resource.cc
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/task_runner_util.h"
+#include "base/task/task_runner_util.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/ppapi_messages.h"
diff --git a/chromium/ppapi/proxy/file_io_resource.h b/chromium/ppapi/proxy/file_io_resource.h
index 7f225055f3d..649b9cabb84 100644
--- a/chromium/ppapi/proxy/file_io_resource.h
+++ b/chromium/ppapi/proxy/file_io_resource.h
@@ -11,7 +11,6 @@
 #include <string>
 
 #include "base/files/file.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/private/pp_file_handle.h"
 #include "ppapi/proxy/connection.h"
diff --git a/chromium/ppapi/proxy/file_ref_resource.h b/chromium/ppapi/proxy/file_ref_resource.h
index 38e4c1722bd..b6a1db7e877 100644
--- a/chromium/ppapi/proxy/file_ref_resource.h
+++ b/chromium/ppapi/proxy/file_ref_resource.h
@@ -9,7 +9,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_time.h"
diff --git a/chromium/ppapi/proxy/file_system_resource.h b/chromium/ppapi/proxy/file_system_resource.h
index 8c112a73214..9dd71fecb7e 100644
--- a/chromium/ppapi/proxy/file_system_resource.h
+++ b/chromium/ppapi/proxy/file_system_resource.h
@@ -11,7 +11,6 @@
 #include <string>
 
 #include "base/containers/queue.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_resource.h"
diff --git a/chromium/ppapi/proxy/flash_font_file_resource.h b/chromium/ppapi/proxy/flash_font_file_resource.h
index 7bf65c5d487..8fe12a01f27 100644
--- a/chromium/ppapi/proxy/flash_font_file_resource.h
+++ b/chromium/ppapi/proxy/flash_font_file_resource.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <unordered_map>
 
-#include "base/macros.h"
 #include "ppapi/c/private/pp_private_font_charset.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/serialized_structs.h"
diff --git a/chromium/ppapi/proxy/flash_fullscreen_resource.h b/chromium/ppapi/proxy/flash_fullscreen_resource.h
index a57b7a2bb0b..5978ac2fd33 100644
--- a/chromium/ppapi/proxy/flash_fullscreen_resource.h
+++ b/chromium/ppapi/proxy/flash_fullscreen_resource.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_FLASH_FULLSCREEN_RESOURCE_H_
 #define PPAPI_PROXY_FLASH_FULLSCREEN_RESOURCE_H_
 
-#include "base/macros.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/thunk/ppb_flash_fullscreen_api.h"
diff --git a/chromium/ppapi/proxy/gamepad_resource.h b/chromium/ppapi/proxy/gamepad_resource.h
index 8e357633379..f7a791a2365 100644
--- a/chromium/ppapi/proxy/gamepad_resource.h
+++ b/chromium/ppapi/proxy/gamepad_resource.h
@@ -6,7 +6,6 @@
 #define PPAPI_PROXY_GAMEPAD_RESOURCE_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "device/gamepad/public/mojom/gamepad_hardware_buffer.h"
 #include "ppapi/c/ppb_gamepad.h"
diff --git a/chromium/ppapi/proxy/graphics_2d_resource.h b/chromium/ppapi/proxy/graphics_2d_resource.h
index d2b13053e1c..00dd9f7e028 100644
--- a/chromium/ppapi/proxy/graphics_2d_resource.h
+++ b/chromium/ppapi/proxy/graphics_2d_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/thunk/ppb_graphics_2d_api.h"
diff --git a/chromium/ppapi/proxy/host_dispatcher.h b/chromium/ppapi/proxy/host_dispatcher.h
index 5f4317ec51a..427131bd8c2 100644
--- a/chromium/ppapi/proxy/host_dispatcher.h
+++ b/chromium/ppapi/proxy/host_dispatcher.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/process/process.h"
@@ -56,6 +55,10 @@ class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher {
   HostDispatcher(PP_Module module,
                  PP_GetInterface_Func local_get_interface,
                  const PpapiPermissions& permissions);
+
+  HostDispatcher(const HostDispatcher&) = delete;
+  HostDispatcher& operator=(const HostDispatcher&) = delete;
+
   ~HostDispatcher();
 
   // You must call this function before anything else. Returns true on success.
@@ -153,8 +156,6 @@ class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher {
   std::vector<IPC::Listener*> filters_;
 
   base::WeakPtrFactory<HostDispatcher> weak_ptr_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(HostDispatcher);
 };
 
 // Create this object on the stack to prevent the module (and hence the
diff --git a/chromium/ppapi/proxy/host_resolver_private_resource.h b/chromium/ppapi/proxy/host_resolver_private_resource.h
index 149be1ca1ce..2a2ba45a4eb 100644
--- a/chromium/ppapi/proxy/host_resolver_private_resource.h
+++ b/chromium/ppapi/proxy/host_resolver_private_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/host_resolver_resource_base.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/thunk/ppb_host_resolver_private_api.h"
diff --git a/chromium/ppapi/proxy/host_resolver_resource.h b/chromium/ppapi/proxy/host_resolver_resource.h
index de0b31fd4b8..e5beeeb6e0f 100644
--- a/chromium/ppapi/proxy/host_resolver_resource.h
+++ b/chromium/ppapi/proxy/host_resolver_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/host_resolver_resource_base.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/thunk/ppb_host_resolver_api.h"
diff --git a/chromium/ppapi/proxy/host_resolver_resource_base.h b/chromium/ppapi/proxy/host_resolver_resource_base.h
index f5ecd482145..d88a5aa3550 100644
--- a/chromium/ppapi/proxy/host_resolver_resource_base.h
+++ b/chromium/ppapi/proxy/host_resolver_resource_base.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/private/ppb_host_resolver_private.h"
 #include "ppapi/proxy/plugin_resource.h"
diff --git a/chromium/ppapi/proxy/host_var_serialization_rules.h b/chromium/ppapi/proxy/host_var_serialization_rules.h
index 7cc2b54fb0c..fe3a924eb7d 100644
--- a/chromium/ppapi/proxy/host_var_serialization_rules.h
+++ b/chromium/ppapi/proxy/host_var_serialization_rules.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_HOST_VAR_SERIALIZATION_RULES_H_
 #define PPAPI_PROXY_HOST_VAR_SERIALIZATION_RULES_H_
 
-#include "base/macros.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/proxy/var_serialization_rules.h"
 
diff --git a/chromium/ppapi/proxy/interface_list.h b/chromium/ppapi/proxy/interface_list.h
index d4173054ad2..29050f113a2 100644
--- a/chromium/ppapi/proxy/interface_list.h
+++ b/chromium/ppapi/proxy/interface_list.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <unordered_map>
 
-#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
@@ -62,6 +61,9 @@ class PPAPI_PROXY_EXPORT InterfaceList {
           sent_to_uma_(false) {
     }
 
+    InterfaceInfo(const InterfaceInfo&) = delete;
+    InterfaceInfo& operator=(const InterfaceInfo&) = delete;
+
     const void* iface() { return iface_; }
 
     // Permission required to return non-null for this interface. This will
@@ -75,8 +77,6 @@ class PPAPI_PROXY_EXPORT InterfaceList {
     void LogWithUmaOnce(const std::string& name);
 
    private:
-    DISALLOW_COPY_AND_ASSIGN(InterfaceInfo);
-
     const void* const iface_;
     const Permission required_permission_;
 
diff --git a/chromium/ppapi/proxy/isolated_file_system_private_resource.h b/chromium/ppapi/proxy/isolated_file_system_private_resource.h
index 757a7c6af80..87c73830626 100644
--- a/chromium/ppapi/proxy/isolated_file_system_private_resource.h
+++ b/chromium/ppapi/proxy/isolated_file_system_private_resource.h
@@ -23,7 +23,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
diff --git a/chromium/ppapi/proxy/locking_resource_releaser.h b/chromium/ppapi/proxy/locking_resource_releaser.h
index 291a087c79b..487a973c9c5 100644
--- a/chromium/ppapi/proxy/locking_resource_releaser.h
+++ b/chromium/ppapi/proxy/locking_resource_releaser.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_LOCKING_RESOURCE_RELEASER_H_
 #define PPAPI_PROXY_LOCKING_RESOURCE_RELEASER_H_
 
-#include "base/macros.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource_tracker.h"
diff --git a/chromium/ppapi/proxy/media_stream_audio_track_resource.h b/chromium/ppapi/proxy/media_stream_audio_track_resource.h
index a27e6b8c58d..0220d921485 100644
--- a/chromium/ppapi/proxy/media_stream_audio_track_resource.h
+++ b/chromium/ppapi/proxy/media_stream_audio_track_resource.h
@@ -10,7 +10,6 @@
 #include <map>
 #include <string>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/proxy/media_stream_track_resource_base.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/media_stream_track_resource_base.h b/chromium/ppapi/proxy/media_stream_track_resource_base.h
index 1de5d0d9aa5..e0c8690e66a 100644
--- a/chromium/ppapi/proxy/media_stream_track_resource_base.h
+++ b/chromium/ppapi/proxy/media_stream_track_resource_base.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/media_stream_buffer_manager.h"
@@ -26,6 +25,10 @@ class PPAPI_PROXY_EXPORT MediaStreamTrackResourceBase
 
   MediaStreamTrackResourceBase(Connection connection, PP_Instance instance);
 
+  MediaStreamTrackResourceBase(const MediaStreamTrackResourceBase&) = delete;
+  MediaStreamTrackResourceBase& operator=(const MediaStreamTrackResourceBase&) =
+      delete;
+
   ~MediaStreamTrackResourceBase() override;
 
   std::string id() const { return id_; }
@@ -64,8 +67,6 @@ class PPAPI_PROXY_EXPORT MediaStreamTrackResourceBase
   std::string id_;
 
   bool has_ended_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaStreamTrackResourceBase);
 };
 
 }  // namespace proxy
diff --git a/chromium/ppapi/proxy/media_stream_video_track_resource.h b/chromium/ppapi/proxy/media_stream_video_track_resource.h
index a7bb5fecb94..16e10346e1e 100644
--- a/chromium/ppapi/proxy/media_stream_video_track_resource.h
+++ b/chromium/ppapi/proxy/media_stream_video_track_resource.h
@@ -9,7 +9,6 @@
 
 #include <map>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/proxy/media_stream_track_resource_base.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/message_handler.cc b/chromium/ppapi/proxy/message_handler.cc
index cf97a4cbd17..7a5bac8fc00 100644
--- a/chromium/ppapi/proxy/message_handler.cc
+++ b/chromium/ppapi/proxy/message_handler.cc
@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
diff --git a/chromium/ppapi/proxy/message_handler.h b/chromium/ppapi/proxy/message_handler.h
index aed41234df4..3d58d9ff4c4 100644
--- a/chromium/ppapi/proxy/message_handler.h
+++ b/chromium/ppapi/proxy/message_handler.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppp_message_handler.h"
diff --git a/chromium/ppapi/proxy/mock_resource.h b/chromium/ppapi/proxy/mock_resource.h
index 5b024e58bed..69338cc72ee 100644
--- a/chromium/ppapi/proxy/mock_resource.h
+++ b/chromium/ppapi/proxy/mock_resource.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_MOCK_RESOURCE_H_
 #define PPAPI_PROXY_MOCK_RESOURCE_H_
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/shared_impl/resource.h"
 
diff --git a/chromium/ppapi/proxy/nacl_message_scanner.h b/chromium/ppapi/proxy/nacl_message_scanner.h
index 0681360c41d..3a2696b19dd 100644
--- a/chromium/ppapi/proxy/nacl_message_scanner.h
+++ b/chromium/ppapi/proxy/nacl_message_scanner.h
@@ -11,7 +11,6 @@
 #include <memory>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/net_address_resource.h b/chromium/ppapi/proxy/net_address_resource.h
index 9eebe23a309..e9e292c9200 100644
--- a/chromium/ppapi/proxy/net_address_resource.h
+++ b/chromium/ppapi/proxy/net_address_resource.h
@@ -6,7 +6,6 @@
 #define PPAPI_PROXY_NET_ADDRESS_RESOURCE_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/network_list_resource.h b/chromium/ppapi/proxy/network_list_resource.h
index a88b184bec8..0baa432fbdf 100644
--- a/chromium/ppapi/proxy/network_list_resource.h
+++ b/chromium/ppapi/proxy/network_list_resource.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/network_monitor_resource.h b/chromium/ppapi/proxy/network_monitor_resource.h
index 6a442a040e4..08f4b8022a1 100644
--- a/chromium/ppapi/proxy/network_monitor_resource.h
+++ b/chromium/ppapi/proxy/network_monitor_resource.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/proxy/network_list_resource.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
diff --git a/chromium/ppapi/proxy/network_proxy_resource.h b/chromium/ppapi/proxy/network_proxy_resource.h
index 41bca8b0fb5..7c9febc122d 100644
--- a/chromium/ppapi/proxy/network_proxy_resource.h
+++ b/chromium/ppapi/proxy/network_proxy_resource.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/thunk/ppb_network_proxy_api.h"
diff --git a/chromium/ppapi/proxy/pdf_resource.cc b/chromium/ppapi/proxy/pdf_resource.cc
index af10f41441b..0df6367ee18 100644
--- a/chromium/ppapi/proxy/pdf_resource.cc
+++ b/chromium/ppapi/proxy/pdf_resource.cc
@@ -71,9 +71,7 @@ void PDFResource::SearchString(const unsigned short* input_string,
   UErrorCode status = U_ZERO_ERROR;
   UStringSearch* searcher =
       usearch_open(term, -1, string, -1, locale_.c_str(), nullptr, &status);
-  DCHECK(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING ||
-         status == U_USING_DEFAULT_WARNING)
-      << status;
+  DCHECK(U_SUCCESS(status)) << status;
   UCollationStrength strength = case_sensitive ? UCOL_TERTIARY : UCOL_PRIMARY;
 
   UCollator* collator = usearch_getCollator(searcher);
@@ -84,7 +82,7 @@ void PDFResource::SearchString(const unsigned short* input_string,
 
   status = U_ZERO_ERROR;
   int match_start = usearch_first(searcher, &status);
-  DCHECK_EQ(U_ZERO_ERROR, status);
+  DCHECK(U_SUCCESS(status));
 
   std::vector<PP_PrivateFindResult> pp_results;
   while (match_start != USEARCH_DONE) {
@@ -94,7 +92,7 @@ void PDFResource::SearchString(const unsigned short* input_string,
     result.length = matched_length;
     pp_results.push_back(result);
     match_start = usearch_next(searcher, &status);
-    DCHECK_EQ(U_ZERO_ERROR, status);
+    DCHECK(U_SUCCESS(status));
   }
 
   if (pp_results.empty() ||
diff --git a/chromium/ppapi/proxy/pdf_resource.h b/chromium/ppapi/proxy/pdf_resource.h
index 28763e0866a..8c2d9deccd4 100644
--- a/chromium/ppapi/proxy/pdf_resource.h
+++ b/chromium/ppapi/proxy/pdf_resource.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/proxy/connection.h"
diff --git a/chromium/ppapi/proxy/plugin_array_buffer_var.h b/chromium/ppapi/proxy/plugin_array_buffer_var.h
index 05c906fd1f4..8f7bf477157 100644
--- a/chromium/ppapi/proxy/plugin_array_buffer_var.h
+++ b/chromium/ppapi/proxy/plugin_array_buffer_var.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "ppapi/c/pp_instance.h"
diff --git a/chromium/ppapi/proxy/plugin_dispatcher.h b/chromium/ppapi/proxy/plugin_dispatcher.h
index 1c8f5b49811..b96ef0d8690 100644
--- a/chromium/ppapi/proxy/plugin_dispatcher.h
+++ b/chromium/ppapi/proxy/plugin_dispatcher.h
@@ -11,7 +11,6 @@
 #include <string>
 #include <unordered_map>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
@@ -148,6 +147,10 @@ class PPAPI_PROXY_EXPORT PluginDispatcher
   PluginDispatcher(PP_GetInterface_Func get_interface,
                    const PpapiPermissions& permissions,
                    bool incognito);
+
+  PluginDispatcher(const PluginDispatcher&) = delete;
+  PluginDispatcher& operator=(const PluginDispatcher&) = delete;
+
   virtual ~PluginDispatcher();
 
   // The plugin side maintains a mapping from PP_Instance to Dispatcher so
@@ -255,8 +258,6 @@ class PPAPI_PROXY_EXPORT PluginDispatcher
   bool incognito_;
 
   scoped_refptr<Sender> sender_;
-
-  DISALLOW_COPY_AND_ASSIGN(PluginDispatcher);
 };
 
 }  // namespace proxy
diff --git a/chromium/ppapi/proxy/plugin_globals.cc b/chromium/ppapi/proxy/plugin_globals.cc
index 2719338274c..a5942a90596 100644
--- a/chromium/ppapi/proxy/plugin_globals.cc
+++ b/chromium/ppapi/proxy/plugin_globals.cc
@@ -6,10 +6,9 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/message_loop/message_pump_type.h"
-#include "base/single_thread_task_runner.h"
-#include "base/task_runner.h"
+#include "base/task/single_thread_task_runner.h"
+#include "base/task/task_runner.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ipc/ipc_message.h"
diff --git a/chromium/ppapi/proxy/plugin_globals.h b/chromium/ppapi/proxy/plugin_globals.h
index 404566aa86a..6631e8f6128 100644
--- a/chromium/ppapi/proxy/plugin_globals.h
+++ b/chromium/ppapi/proxy/plugin_globals.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_local_storage.h"
 #include "ppapi/proxy/connection.h"
diff --git a/chromium/ppapi/proxy/plugin_message_filter.cc b/chromium/ppapi/proxy/plugin_message_filter.cc
index 0071e35317d..61c53ea977a 100644
--- a/chromium/ppapi/proxy/plugin_message_filter.cc
+++ b/chromium/ppapi/proxy/plugin_message_filter.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "ipc/ipc_channel.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/resource_message_params.h"
diff --git a/chromium/ppapi/proxy/plugin_resource.h b/chromium/ppapi/proxy/plugin_resource.h
index fddb5c4acd1..45bd0ab4b0e 100644
--- a/chromium/ppapi/proxy/plugin_resource.h
+++ b/chromium/ppapi/proxy/plugin_resource.h
@@ -10,7 +10,6 @@
 #include <map>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
diff --git a/chromium/ppapi/proxy/plugin_resource_tracker.h b/chromium/ppapi/proxy/plugin_resource_tracker.h
index 743496ef65d..ca58ebb88f4 100644
--- a/chromium/ppapi/proxy/plugin_resource_tracker.h
+++ b/chromium/ppapi/proxy/plugin_resource_tracker.h
@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
diff --git a/chromium/ppapi/proxy/plugin_resource_var.h b/chromium/ppapi/proxy/plugin_resource_var.h
index 863c23b7d29..e1a5615e058 100644
--- a/chromium/ppapi/proxy/plugin_resource_var.h
+++ b/chromium/ppapi/proxy/plugin_resource_var.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_PLUGIN_RESOURCE_VAR_H_
 #define PPAPI_PROXY_PLUGIN_RESOURCE_VAR_H_
 
-#include "base/macros.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/resource.h"
@@ -22,6 +21,9 @@ class PPAPI_PROXY_EXPORT PluginResourceVar : public ppapi::ResourceVar {
   // Takes one reference to the given resource.
   explicit PluginResourceVar(ppapi::Resource* resource);
 
+  PluginResourceVar(const PluginResourceVar&) = delete;
+  PluginResourceVar& operator=(const PluginResourceVar&) = delete;
+
   // ResourceVar override.
   PP_Resource GetPPResource() const override;
   bool IsPending() const override;
@@ -34,8 +36,6 @@ class PPAPI_PROXY_EXPORT PluginResourceVar : public ppapi::ResourceVar {
  private:
   // If NULL, this represents the PP_Resource 0.
   scoped_refptr<ppapi::Resource> resource_;
-
-  DISALLOW_COPY_AND_ASSIGN(PluginResourceVar);
 };
 
 #endif  // PPAPI_PROXY_PLUGIN_RESOURCE_VAR_H_
diff --git a/chromium/ppapi/proxy/plugin_var_serialization_rules.h b/chromium/ppapi/proxy/plugin_var_serialization_rules.h
index 511227ca0de..99b8a5a8097 100644
--- a/chromium/ppapi/proxy/plugin_var_serialization_rules.h
+++ b/chromium/ppapi/proxy/plugin_var_serialization_rules.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_PLUGIN_VAR_SERIALIZATION_RULES_H_
 #define PPAPI_PROXY_PLUGIN_VAR_SERIALIZATION_RULES_H_
 
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/proxy/var_serialization_rules.h"
 
diff --git a/chromium/ppapi/proxy/plugin_var_tracker.cc b/chromium/ppapi/proxy/plugin_var_tracker.cc
index b8fcd568581..b558d862720 100644
--- a/chromium/ppapi/proxy/plugin_var_tracker.cc
+++ b/chromium/ppapi/proxy/plugin_var_tracker.cc
@@ -517,5 +517,5 @@ bool PluginVarTracker::StopTrackingSharedMemoryRegion(
   return false;
 }
 
-}  // namesace proxy
+}  // namespace proxy
 }  // namespace ppapi
diff --git a/chromium/ppapi/proxy/plugin_var_tracker.h b/chromium/ppapi/proxy/plugin_var_tracker.h
index 031a2ca8527..60b2dea5c7d 100644
--- a/chromium/ppapi/proxy/plugin_var_tracker.h
+++ b/chromium/ppapi/proxy/plugin_var_tracker.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "ppapi/c/pp_stdint.h"
diff --git a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h
index a7d343405eb..ee2bcec1d49 100644
--- a/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h
+++ b/chromium/ppapi/proxy/ppapi_command_buffer_proxy.h
@@ -11,7 +11,6 @@
 #include <memory>
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
diff --git a/chromium/ppapi/proxy/ppapi_messages.h b/chromium/ppapi/proxy/ppapi_messages.h
index 7eebdaabeb5..7a9c887d927 100644
--- a/chromium/ppapi/proxy/ppapi_messages.h
+++ b/chromium/ppapi/proxy/ppapi_messages.h
@@ -105,7 +105,7 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(PP_InputEvent_Type,
                               PP_INPUTEVENT_TYPE_FIRST,
                               PP_INPUTEVENT_TYPE_LAST)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_IsolatedFileSystemType_Private,
-                          PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE)
+                          PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_NetAddressFamily_Private,
                           PP_NETADDRESSFAMILY_PRIVATE_IPV6)
 IPC_ENUM_TRAITS_MAX_VALUE(PP_NetworkList_State, PP_NETWORKLIST_STATE_UP)
@@ -599,12 +599,6 @@ IPC_MESSAGE_CONTROL3(PpapiMsg_CreateChannel,
 IPC_MESSAGE_CONTROL1(PpapiMsg_InitializeNaClDispatcher,
                      ppapi::PpapiNaClPluginArgs /* args */)
 
-// Instructs the plugin process to crash.
-IPC_MESSAGE_CONTROL0(PpapiMsg_Crash)
-
-// Instructs the plugin process to hang.
-IPC_MESSAGE_CONTROL0(PpapiMsg_Hang)
-
 // Each plugin may be referenced by multiple renderers. We need the instance
 // IDs to be unique within a plugin, despite coming from different renderers,
 // and unique within a renderer, despite going to different plugins. This means
diff --git a/chromium/ppapi/proxy/ppapi_param_traits.cc b/chromium/ppapi/proxy/ppapi_param_traits.cc
index 5eaa5ac511c..d65410ba69c 100644
--- a/chromium/ppapi/proxy/ppapi_param_traits.cc
+++ b/chromium/ppapi/proxy/ppapi_param_traits.cc
@@ -8,7 +8,6 @@
 #include <stdint.h>
 #include <string.h>  // For memcpy
 
-#include "base/macros.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
diff --git a/chromium/ppapi/proxy/ppapi_proxy_test.cc b/chromium/ppapi/proxy/ppapi_proxy_test.cc
index 31e58ce2e94..38a64f7c797 100644
--- a/chromium/ppapi/proxy/ppapi_proxy_test.cc
+++ b/chromium/ppapi/proxy/ppapi_proxy_test.cc
@@ -14,7 +14,7 @@
 #include "base/observer_list.h"
 #include "base/process/process_handle.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/message_filter.h"
diff --git a/chromium/ppapi/proxy/ppapi_proxy_test.h b/chromium/ppapi/proxy/ppapi_proxy_test.h
index 2c90349ef4c..47c8c225d2e 100644
--- a/chromium/ppapi/proxy/ppapi_proxy_test.h
+++ b/chromium/ppapi/proxy/ppapi_proxy_test.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/task_environment.h"
diff --git a/chromium/ppapi/proxy/ppb_audio_proxy.cc b/chromium/ppapi/proxy/ppb_audio_proxy.cc
index f0ee2d43551..eb9bc879999 100644
--- a/chromium/ppapi/proxy/ppb_audio_proxy.cc
+++ b/chromium/ppapi/proxy/ppb_audio_proxy.cc
@@ -5,7 +5,6 @@
 #include "ppapi/proxy/ppb_audio_proxy.h"
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/threading/simple_thread.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/chromium/ppapi/proxy/ppb_audio_proxy.h b/chromium/ppapi/proxy/ppb_audio_proxy.h
index 04742bc614f..41d6952c572 100644
--- a/chromium/ppapi/proxy/ppb_audio_proxy.h
+++ b/chromium/ppapi/proxy/ppb_audio_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/sync_socket.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/chromium/ppapi/proxy/ppb_buffer_proxy.h b/chromium/ppapi/proxy/ppb_buffer_proxy.h
index 78696593479..0c1b2c84a3d 100644
--- a/chromium/ppapi/proxy/ppb_buffer_proxy.h
+++ b/chromium/ppapi/proxy/ppb_buffer_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "ppapi/c/pp_instance.h"
diff --git a/chromium/ppapi/proxy/ppb_graphics_3d_proxy.h b/chromium/ppapi/proxy/ppb_graphics_3d_proxy.h
index 20f50843000..687d66e15c4 100644
--- a/chromium/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/chromium/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -9,7 +9,6 @@
 
 #include <vector>
 
-#include "base/macros.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/command_buffer_id.h"
 #include "ppapi/c/pp_graphics_3d.h"
diff --git a/chromium/ppapi/proxy/ppb_image_data_proxy.cc b/chromium/ppapi/proxy/ppb_image_data_proxy.cc
index 03e9b18be50..a7932830c92 100644
--- a/chromium/ppapi/proxy/ppb_image_data_proxy.cc
+++ b/chromium/ppapi/proxy/ppb_image_data_proxy.cc
@@ -11,7 +11,6 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chromium/ppapi/proxy/ppb_image_data_proxy.h b/chromium/ppapi/proxy/ppb_image_data_proxy.h
index db533b24d5a..3bcf57a42e5 100644
--- a/chromium/ppapi/proxy/ppb_image_data_proxy.h
+++ b/chromium/ppapi/proxy/ppb_image_data_proxy.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "build/build_config.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/chromium/ppapi/proxy/ppb_message_loop_proxy.h b/chromium/ppapi/proxy/ppb_message_loop_proxy.h
index f74e07aa845..59357197031 100644
--- a/chromium/ppapi/proxy/ppb_message_loop_proxy.h
+++ b/chromium/ppapi/proxy/ppb_message_loop_proxy.h
@@ -10,11 +10,10 @@
 #include <memory>
 
 #include "base/bind.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
 #include "base/task/single_thread_task_executor.h"
+#include "base/task/single_thread_task_runner.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/ppb_message_loop_shared.h"
diff --git a/chromium/ppapi/proxy/ppb_testing_proxy.h b/chromium/ppapi/proxy/ppb_testing_proxy.h
index 21b7e89baa4..597a15a6277 100644
--- a/chromium/ppapi/proxy/ppb_testing_proxy.h
+++ b/chromium/ppapi/proxy/ppb_testing_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_testing_private.h"
diff --git a/chromium/ppapi/proxy/ppb_var_deprecated_proxy.h b/chromium/ppapi/proxy/ppb_var_deprecated_proxy.h
index bf8f314f677..cf76ce0896a 100644
--- a/chromium/ppapi/proxy/ppb_var_deprecated_proxy.h
+++ b/chromium/ppapi/proxy/ppb_var_deprecated_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppb_video_decoder_proxy.cc b/chromium/ppapi/proxy/ppb_video_decoder_proxy.cc
index cff02dfd7c1..8ee365bc46b 100644
--- a/chromium/ppapi/proxy/ppb_video_decoder_proxy.cc
+++ b/chromium/ppapi/proxy/ppb_video_decoder_proxy.cc
@@ -5,7 +5,6 @@
 #include "ppapi/proxy/ppb_video_decoder_proxy.h"
 
 #include "base/check.h"
-#include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/proxy/enter_proxy.h"
diff --git a/chromium/ppapi/proxy/ppb_video_decoder_proxy.h b/chromium/ppapi/proxy/ppb_video_decoder_proxy.h
index aa7cddcd7e4..38565ad031a 100644
--- a/chromium/ppapi/proxy/ppb_video_decoder_proxy.h
+++ b/chromium/ppapi/proxy/ppb_video_decoder_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_completion_callback_factory.h"
diff --git a/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.cc b/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.cc
index bf1bd13d21a..1d4c130b65e 100644
--- a/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.cc
+++ b/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.cc
@@ -4,7 +4,6 @@
 
 #include "ppapi/proxy/ppb_x509_certificate_private_proxy.h"
 
-#include "base/macros.h"
 #include "ppapi/c/private/ppb_x509_certificate_private.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/ppapi_messages.h"
diff --git a/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.h b/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.h
index 5235bfbb263..47c1cac43c3 100644
--- a/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.h
+++ b/chromium/ppapi/proxy/ppb_x509_certificate_private_proxy.h
@@ -6,7 +6,6 @@
 #define PPAPI_PROXY_PPB_X509_CERTIFICATE_PRIVATE_PROXY_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppp_class_proxy.h b/chromium/ppapi/proxy/ppp_class_proxy.h
index 0aa536c775d..afff38a2005 100644
--- a/chromium/ppapi/proxy/ppp_class_proxy.h
+++ b/chromium/ppapi/proxy/ppp_class_proxy.h
@@ -9,7 +9,6 @@
 
 #include <vector>
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppp_find_proxy.h b/chromium/ppapi/proxy/ppp_find_proxy.h
index 26b9a8acad6..a55a11413fe 100644
--- a/chromium/ppapi/proxy/ppp_find_proxy.h
+++ b/chromium/ppapi/proxy/ppp_find_proxy.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "ppapi/c/private/ppp_find_private.h"
 #include "ppapi/proxy/interface_proxy.h"
 
diff --git a/chromium/ppapi/proxy/ppp_graphics_3d_proxy.h b/chromium/ppapi/proxy/ppp_graphics_3d_proxy.h
index abed25f6225..fa265f4b53a 100644
--- a/chromium/ppapi/proxy/ppp_graphics_3d_proxy.h
+++ b/chromium/ppapi/proxy/ppp_graphics_3d_proxy.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_PPP_GRAPHICS_3D_PROXY_H_
 #define PPAPI_PROXY_PPP_GRAPHICS_3D_PROXY_H_
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/ppp_graphics_3d.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppp_input_event_proxy.h b/chromium/ppapi/proxy/ppp_input_event_proxy.h
index 002f5f18fb3..21247dc3f96 100644
--- a/chromium/ppapi/proxy/ppp_input_event_proxy.h
+++ b/chromium/ppapi/proxy/ppp_input_event_proxy.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_PPP_INPUT_EVENT_PROXY_H_
 #define PPAPI_PROXY_PPP_INPUT_EVENT_PROXY_H_
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppp_instance_private_proxy.h b/chromium/ppapi/proxy/ppp_instance_private_proxy.h
index 3e6e1769b6e..785d3d794e3 100644
--- a/chromium/ppapi/proxy/ppp_instance_private_proxy.h
+++ b/chromium/ppapi/proxy/ppp_instance_private_proxy.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_PROXY_PPP_INSTANCE_PRIVATE_PROXY_H_
 #define PPAPI_PROXY_PPP_INSTANCE_PRIVATE_PROXY_H_
 
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
diff --git a/chromium/ppapi/proxy/ppp_messaging_proxy.h b/chromium/ppapi/proxy/ppp_messaging_proxy.h
index 4decf1d8b39..b4ef36d22e3 100644
--- a/chromium/ppapi/proxy/ppp_messaging_proxy.h
+++ b/chromium/ppapi/proxy/ppp_messaging_proxy.h
@@ -6,7 +6,6 @@
 #define PPAPI_PROXY_PPP_MESSAGING_PROXY_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppp_mouse_lock_proxy.h b/chromium/ppapi/proxy/ppp_mouse_lock_proxy.h
index 26b16f50aec..c95f6a48c34 100644
--- a/chromium/ppapi/proxy/ppp_mouse_lock_proxy.h
+++ b/chromium/ppapi/proxy/ppp_mouse_lock_proxy.h
@@ -6,7 +6,6 @@
 #define PPAPI_PROXY_PPP_MOUSE_LOCK_PROXY_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppp_pdf_proxy.h b/chromium/ppapi/proxy/ppp_pdf_proxy.h
index ebb47ce177b..40cf2acbcdd 100644
--- a/chromium/ppapi/proxy/ppp_pdf_proxy.h
+++ b/chromium/ppapi/proxy/ppp_pdf_proxy.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "ppapi/c/private/ppp_pdf.h"
 #include "ppapi/proxy/interface_proxy.h"
 
diff --git a/chromium/ppapi/proxy/ppp_printing_proxy.h b/chromium/ppapi/proxy/ppp_printing_proxy.h
index 25b66e85bdb..8ee442ae111 100644
--- a/chromium/ppapi/proxy/ppp_printing_proxy.h
+++ b/chromium/ppapi/proxy/ppp_printing_proxy.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/proxy/interface_proxy.h"
 
diff --git a/chromium/ppapi/proxy/ppp_text_input_proxy.h b/chromium/ppapi/proxy/ppp_text_input_proxy.h
index 9d37eb7ab15..383d0a14ebd 100644
--- a/chromium/ppapi/proxy/ppp_text_input_proxy.h
+++ b/chromium/ppapi/proxy/ppp_text_input_proxy.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/dev/ppp_text_input_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/ppp_video_decoder_proxy.h b/chromium/ppapi/proxy/ppp_video_decoder_proxy.h
index b1b570a1067..713ed276868 100644
--- a/chromium/ppapi/proxy/ppp_video_decoder_proxy.h
+++ b/chromium/ppapi/proxy/ppp_video_decoder_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/c/dev/ppp_video_decoder_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/chromium/ppapi/proxy/printing_resource.h b/chromium/ppapi/proxy/printing_resource.h
index f16cd78e610..6caaa6b0695 100644
--- a/chromium/ppapi/proxy/printing_resource.h
+++ b/chromium/ppapi/proxy/printing_resource.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/proxy_channel.h b/chromium/ppapi/proxy/proxy_channel.h
index a2a03b90722..011d4a01ff3 100644
--- a/chromium/ppapi/proxy/proxy_channel.h
+++ b/chromium/ppapi/proxy/proxy_channel.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "base/files/scoped_file.h"
-#include "base/macros.h"
 #include "base/memory/read_only_shared_memory_region.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/process/process.h"
diff --git a/chromium/ppapi/proxy/proxy_object_var.h b/chromium/ppapi/proxy/proxy_object_var.h
index 43dde27a628..fc8ba21fa39 100644
--- a/chromium/ppapi/proxy/proxy_object_var.h
+++ b/chromium/ppapi/proxy/proxy_object_var.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/var.h"
 
diff --git a/chromium/ppapi/proxy/raw_var_data.h b/chromium/ppapi/proxy/raw_var_data.h
index 6d6f56486a8..22c7ca739dd 100644
--- a/chromium/ppapi/proxy/raw_var_data.h
+++ b/chromium/ppapi/proxy/raw_var_data.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/proxy/ppapi_param_traits.h"
diff --git a/chromium/ppapi/proxy/resource_creation_proxy.h b/chromium/ppapi/proxy/resource_creation_proxy.h
index f0637ba4d0f..a7c3a219e87 100644
--- a/chromium/ppapi/proxy/resource_creation_proxy.h
+++ b/chromium/ppapi/proxy/resource_creation_proxy.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
 #include "ppapi/c/pp_bool.h"
diff --git a/chromium/ppapi/proxy/resource_reply_thread_registrar.cc b/chromium/ppapi/proxy/resource_reply_thread_registrar.cc
index e2b85a8d900..32ad871a52e 100644
--- a/chromium/ppapi/proxy/resource_reply_thread_registrar.cc
+++ b/chromium/ppapi/proxy/resource_reply_thread_registrar.cc
@@ -5,7 +5,7 @@
 #include "ppapi/proxy/resource_reply_thread_registrar.h"
 
 #include "base/check.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/shared_impl/proxy_lock.h"
diff --git a/chromium/ppapi/proxy/resource_reply_thread_registrar.h b/chromium/ppapi/proxy/resource_reply_thread_registrar.h
index 256890c79dd..8b42ff707a8 100644
--- a/chromium/ppapi/proxy/resource_reply_thread_registrar.h
+++ b/chromium/ppapi/proxy/resource_reply_thread_registrar.h
@@ -10,7 +10,6 @@
 #include <map>
 #include <set>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "ppapi/c/pp_resource.h"
@@ -42,6 +41,10 @@ class PPAPI_PROXY_EXPORT ResourceReplyThreadRegistrar
   explicit ResourceReplyThreadRegistrar(
       scoped_refptr<base::SingleThreadTaskRunner> main_thread);
 
+  ResourceReplyThreadRegistrar(const ResourceReplyThreadRegistrar&) = delete;
+  ResourceReplyThreadRegistrar& operator=(const ResourceReplyThreadRegistrar&) =
+      delete;
+
   // This method can only be called while holding the Pepper proxy lock; the
   // other methods can be called with/without the Pepper proxy lock.
   void Register(PP_Resource resource,
@@ -68,8 +71,6 @@ class PPAPI_PROXY_EXPORT ResourceReplyThreadRegistrar
   base::Lock lock_;
   ResourceMap map_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(ResourceReplyThreadRegistrar);
 };
 
 }  // namespace proxy
diff --git a/chromium/ppapi/proxy/serialized_handle.h b/chromium/ppapi/proxy/serialized_handle.h
index 243e9484de4..88341489839 100644
--- a/chromium/ppapi/proxy/serialized_handle.h
+++ b/chromium/ppapi/proxy/serialized_handle.h
@@ -59,6 +59,9 @@ class PPAPI_PROXY_EXPORT SerializedHandle {
   // Create an invalid handle of the given type.
   explicit SerializedHandle(Type type);
 
+  SerializedHandle(const SerializedHandle&) = delete;
+  SerializedHandle& operator=(const SerializedHandle&) = delete;
+
   // Create a shared memory region handle.
   explicit SerializedHandle(base::ReadOnlySharedMemoryRegion region);
   explicit SerializedHandle(base::UnsafeSharedMemoryRegion region);
@@ -164,8 +167,6 @@ class PPAPI_PROXY_EXPORT SerializedHandle {
   int32_t open_flags_;
   // This is non-zero if file writes require quota checking.
   PP_Resource file_io_;
-
-  DISALLOW_COPY_AND_ASSIGN(SerializedHandle);
 };
 
 }  // namespace proxy
diff --git a/chromium/ppapi/proxy/serialized_var.h b/chromium/ppapi/proxy/serialized_var.h
index cf5128428cd..668d5d89baf 100644
--- a/chromium/ppapi/proxy/serialized_var.h
+++ b/chromium/ppapi/proxy/serialized_var.h
@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_var.h"
@@ -283,10 +282,12 @@ class PPAPI_PROXY_EXPORT ReceiveSerializedVarReturnValue
   //   ReceiveSerializedVarReturnValue(serialized).Return(dispatcher);
   explicit ReceiveSerializedVarReturnValue(const SerializedVar& serialized);
 
-  PP_Var Return(Dispatcher* dispatcher);
+  ReceiveSerializedVarReturnValue(const ReceiveSerializedVarReturnValue&) =
+      delete;
+  ReceiveSerializedVarReturnValue& operator=(
+      const ReceiveSerializedVarReturnValue&) = delete;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(ReceiveSerializedVarReturnValue);
+  PP_Var Return(Dispatcher* dispatcher);
 };
 
 // Example for API:
@@ -300,7 +301,14 @@ class PPAPI_PROXY_EXPORT ReceiveSerializedVarReturnValue
 //   }
 class PPAPI_PROXY_EXPORT ReceiveSerializedException : public SerializedVar {
  public:
+  ReceiveSerializedException() = delete;
+
   ReceiveSerializedException(Dispatcher* dispatcher, PP_Var* exception);
+
+  ReceiveSerializedException(const ReceiveSerializedException&) = delete;
+  ReceiveSerializedException& operator=(const ReceiveSerializedException&) =
+      delete;
+
   ~ReceiveSerializedException();
 
   // Returns true if the exception passed in the constructor is set. Check
@@ -310,8 +318,6 @@ class PPAPI_PROXY_EXPORT ReceiveSerializedException : public SerializedVar {
  private:
   // The input/output exception we're wrapping. May be NULL.
   PP_Var* exception_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ReceiveSerializedException);
 };
 
 // Helper class for when we're returning a vector of Vars. When it goes out
@@ -329,9 +335,17 @@ class PPAPI_PROXY_EXPORT ReceiveSerializedException : public SerializedVar {
 //   }
 class PPAPI_PROXY_EXPORT ReceiveSerializedVarVectorOutParam {
  public:
+  ReceiveSerializedVarVectorOutParam() = delete;
+
   ReceiveSerializedVarVectorOutParam(Dispatcher* dispatcher,
                                      uint32_t* output_count,
                                      PP_Var** output);
+
+  ReceiveSerializedVarVectorOutParam(
+      const ReceiveSerializedVarVectorOutParam&) = delete;
+  ReceiveSerializedVarVectorOutParam& operator=(
+      const ReceiveSerializedVarVectorOutParam&) = delete;
+
   ~ReceiveSerializedVarVectorOutParam();
 
   std::vector<SerializedVar>* OutParam();
@@ -342,8 +356,6 @@ class PPAPI_PROXY_EXPORT ReceiveSerializedVarVectorOutParam {
   PP_Var** output_;
 
   std::vector<SerializedVar> vector_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ReceiveSerializedVarVectorOutParam);
 };
 
 // Helpers for message receiving side ------------------------------------------
diff --git a/chromium/ppapi/proxy/tcp_server_socket_private_resource.h b/chromium/ppapi/proxy/tcp_server_socket_private_resource.h
index b92e177d032..9c35fe9067e 100644
--- a/chromium/ppapi/proxy/tcp_server_socket_private_resource.h
+++ b/chromium/ppapi/proxy/tcp_server_socket_private_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/tcp_socket_private_resource.h b/chromium/ppapi/proxy/tcp_socket_private_resource.h
index 90cb4c35d82..de6f481af56 100644
--- a/chromium/ppapi/proxy/tcp_socket_private_resource.h
+++ b/chromium/ppapi/proxy/tcp_socket_private_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/tcp_socket_resource_base.h"
 #include "ppapi/thunk/ppb_tcp_socket_private_api.h"
 
diff --git a/chromium/ppapi/proxy/tcp_socket_resource.h b/chromium/ppapi/proxy/tcp_socket_resource.h
index 98d9547329a..24d2812656d 100644
--- a/chromium/ppapi/proxy/tcp_socket_resource.h
+++ b/chromium/ppapi/proxy/tcp_socket_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/tcp_socket_resource_base.h"
 #include "ppapi/thunk/ppb_tcp_socket_api.h"
 
diff --git a/chromium/ppapi/proxy/tcp_socket_resource_base.h b/chromium/ppapi/proxy/tcp_socket_resource_base.h
index 395618c9c7b..300da5c5b89 100644
--- a/chromium/ppapi/proxy/tcp_socket_resource_base.h
+++ b/chromium/ppapi/proxy/tcp_socket_resource_base.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/containers/queue.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/ppb_tcp_socket.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
@@ -41,6 +40,9 @@ class PPAPI_PROXY_EXPORT TCPSocketResourceBase : public PluginResource {
                         const PP_NetAddress_Private& local_addr,
                         const PP_NetAddress_Private& remote_addr);
 
+  TCPSocketResourceBase(const TCPSocketResourceBase&) = delete;
+  TCPSocketResourceBase& operator=(const TCPSocketResourceBase&) = delete;
+
   virtual ~TCPSocketResourceBase();
 
   // Implemented by subclasses to create resources for accepted sockets.
@@ -127,8 +129,6 @@ class PPAPI_PROXY_EXPORT TCPSocketResourceBase : public PluginResource {
   void RunCallback(scoped_refptr<TrackedCallback> callback, int32_t pp_result);
 
   TCPSocketVersion version_;
-
-  DISALLOW_COPY_AND_ASSIGN(TCPSocketResourceBase);
 };
 
 }  // namespace proxy
diff --git a/chromium/ppapi/proxy/tcp_socket_resource_constants.h b/chromium/ppapi/proxy/tcp_socket_resource_constants.h
index 6520cc2cbd6..46b17a72caa 100644
--- a/chromium/ppapi/proxy/tcp_socket_resource_constants.h
+++ b/chromium/ppapi/proxy/tcp_socket_resource_constants.h
@@ -7,13 +7,15 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
-
 namespace ppapi {
 namespace proxy {
 
 class TCPSocketResourceConstants {
  public:
+  TCPSocketResourceConstants(const TCPSocketResourceConstants&) = delete;
+  TCPSocketResourceConstants& operator=(const TCPSocketResourceConstants&) =
+      delete;
+
   // The maximum number of bytes that each PpapiHostMsg_PPBTCPSocket_Read
   // message is allowed to request.
   enum { kMaxReadSize = 1024 * 1024 };
@@ -31,12 +33,9 @@ class TCPSocketResourceConstants {
   // argument sanity check, it doesn't mean the browser guarantees to support
   // such a buffer size.
   enum { kMaxReceiveBufferSize = 1024 * kMaxReadSize };
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TCPSocketResourceConstants);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
-#endif  // PPAPI_PROXY_TCP_SOCKET_RESOURCE_CONSTANTS_H_
-\ No newline at end of file
+#endif  // PPAPI_PROXY_TCP_SOCKET_RESOURCE_CONSTANTS_H_
diff --git a/chromium/ppapi/proxy/tracked_callback_unittest.cc b/chromium/ppapi/proxy/tracked_callback_unittest.cc
index bf1423708ab..6fc56193bfa 100644
--- a/chromium/ppapi/proxy/tracked_callback_unittest.cc
+++ b/chromium/ppapi/proxy/tracked_callback_unittest.cc
@@ -8,8 +8,8 @@
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/simple_thread.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/chromium/ppapi/proxy/udp_socket_private_resource.h b/chromium/ppapi/proxy/udp_socket_private_resource.h
index aaaf54df308..1a4c33b278a 100644
--- a/chromium/ppapi/proxy/udp_socket_private_resource.h
+++ b/chromium/ppapi/proxy/udp_socket_private_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/proxy/udp_socket_resource_base.h"
 #include "ppapi/thunk/ppb_udp_socket_private_api.h"
diff --git a/chromium/ppapi/proxy/udp_socket_resource.h b/chromium/ppapi/proxy/udp_socket_resource.h
index d0a751f07ac..3f4b629a9db 100644
--- a/chromium/ppapi/proxy/udp_socket_resource.h
+++ b/chromium/ppapi/proxy/udp_socket_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/proxy/udp_socket_resource_base.h"
 #include "ppapi/thunk/ppb_udp_socket_api.h"
diff --git a/chromium/ppapi/proxy/udp_socket_resource_base.h b/chromium/ppapi/proxy/udp_socket_resource_base.h
index 2d0c65c25fa..9649f3d267e 100644
--- a/chromium/ppapi/proxy/udp_socket_resource_base.h
+++ b/chromium/ppapi/proxy/udp_socket_resource_base.h
@@ -10,7 +10,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/containers/queue.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/ppb_udp_socket.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
@@ -29,6 +28,10 @@ class PPAPI_PROXY_EXPORT UDPSocketResourceBase : public PluginResource {
   UDPSocketResourceBase(Connection connection,
                         PP_Instance instance,
                         bool private_api);
+
+  UDPSocketResourceBase(const UDPSocketResourceBase&) = delete;
+  UDPSocketResourceBase& operator=(const UDPSocketResourceBase&) = delete;
+
   virtual ~UDPSocketResourceBase();
 
   int32_t SetOptionImpl(PP_UDPSocket_Option name,
@@ -81,8 +84,6 @@ class PPAPI_PROXY_EXPORT UDPSocketResourceBase : public PluginResource {
   PP_NetAddress_Private bound_addr_;
 
   base::queue<scoped_refptr<TrackedCallback>> sendto_callbacks_;
-
-  DISALLOW_COPY_AND_ASSIGN(UDPSocketResourceBase);
 };
 
 }  // namespace proxy
diff --git a/chromium/ppapi/proxy/udp_socket_resource_constants.h b/chromium/ppapi/proxy/udp_socket_resource_constants.h
index 0745e4796fa..4f6c80690e4 100644
--- a/chromium/ppapi/proxy/udp_socket_resource_constants.h
+++ b/chromium/ppapi/proxy/udp_socket_resource_constants.h
@@ -7,13 +7,15 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
-
 namespace ppapi {
 namespace proxy {
 
 class UDPSocketResourceConstants {
  public:
+  UDPSocketResourceConstants(const UDPSocketResourceConstants&) = delete;
+  UDPSocketResourceConstants& operator=(const UDPSocketResourceConstants&) =
+      delete;
+
   // The maximum number of bytes that each
   // PpapiPluginMsg_PPBUDPSocket_PushRecvResult message is allowed to carry.
   enum { kMaxReadSize = 128 * 1024 };
@@ -38,9 +40,6 @@ class UDPSocketResourceConstants {
   // The maximum number of buffers that we allow instances of this class to be
   // sending before we block the plugin.
   enum { kPluginSendBufferSlots = 8u };
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(UDPSocketResourceConstants);
 };
 
 }  // namespace proxy
diff --git a/chromium/ppapi/proxy/uma_private_resource.h b/chromium/ppapi/proxy/uma_private_resource.h
index 2fb40c031ff..f616920ad7f 100644
--- a/chromium/ppapi/proxy/uma_private_resource.h
+++ b/chromium/ppapi/proxy/uma_private_resource.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/url_loader_resource.h b/chromium/ppapi/proxy/url_loader_resource.h
index fb3ec5ce6a3..3a9f188e741 100644
--- a/chromium/ppapi/proxy/url_loader_resource.h
+++ b/chromium/ppapi/proxy/url_loader_resource.h
@@ -10,7 +10,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/containers/circular_deque.h"
-#include "base/macros.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
diff --git a/chromium/ppapi/proxy/url_request_info_resource.h b/chromium/ppapi/proxy/url_request_info_resource.h
index f04c9683417..11e9947555c 100644
--- a/chromium/ppapi/proxy/url_request_info_resource.h
+++ b/chromium/ppapi/proxy/url_request_info_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/url_request_info_data.h"
diff --git a/chromium/ppapi/proxy/url_response_info_resource.h b/chromium/ppapi/proxy/url_response_info_resource.h
index 81aa65103df..25edf2d27c6 100644
--- a/chromium/ppapi/proxy/url_response_info_resource.h
+++ b/chromium/ppapi/proxy/url_response_info_resource.h
@@ -6,7 +6,6 @@
 #define PPAPI_PROXY_URL_RESPONSE_INFO_RESOURCE_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
diff --git a/chromium/ppapi/proxy/video_capture_resource.h b/chromium/ppapi/proxy/video_capture_resource.h
index c64c24e9af0..ba5e590bcfc 100644
--- a/chromium/ppapi/proxy/video_capture_resource.h
+++ b/chromium/ppapi/proxy/video_capture_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/dev/ppp_video_capture_dev.h"
 #include "ppapi/proxy/device_enumeration_resource_helper.h"
 #include "ppapi/proxy/plugin_resource.h"
diff --git a/chromium/ppapi/proxy/video_decoder_resource.h b/chromium/ppapi/proxy/video_decoder_resource.h
index e39901177c0..536269ba086 100644
--- a/chromium/ppapi/proxy/video_decoder_resource.h
+++ b/chromium/ppapi/proxy/video_decoder_resource.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "base/containers/queue.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
diff --git a/chromium/ppapi/proxy/video_encoder_resource.h b/chromium/ppapi/proxy/video_encoder_resource.h
index 0ba2373f2f5..7276c4d0cc2 100644
--- a/chromium/ppapi/proxy/video_encoder_resource.h
+++ b/chromium/ppapi/proxy/video_encoder_resource.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/containers/circular_deque.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "ppapi/proxy/connection.h"
diff --git a/chromium/ppapi/proxy/video_frame_resource.h b/chromium/ppapi/proxy/video_frame_resource.h
index 7d0a8822e15..a2d816c4323 100644
--- a/chromium/ppapi/proxy/video_frame_resource.h
+++ b/chromium/ppapi/proxy/video_frame_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/media_stream_buffer.h"
 #include "ppapi/shared_impl/resource.h"
diff --git a/chromium/ppapi/proxy/websocket_resource.h b/chromium/ppapi/proxy/websocket_resource.h
index a8cf9bf3ac5..2620d1af321 100644
--- a/chromium/ppapi/proxy/websocket_resource.h
+++ b/chromium/ppapi/proxy/websocket_resource.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/containers/queue.h"
-#include "base/macros.h"
 #include "ppapi/c/ppb_websocket.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/shared_impl/tracked_callback.h"
diff --git a/chromium/ppapi/shared_impl/BUILD.gn b/chromium/ppapi/shared_impl/BUILD.gn
index 5d1c48b45d7..65d2f2faebc 100644
--- a/chromium/ppapi/shared_impl/BUILD.gn
+++ b/chromium/ppapi/shared_impl/BUILD.gn
@@ -104,15 +104,12 @@ source_set("common") {
     "//ppapi/c:c",
     "//ppapi/thunk:headers",
     "//third_party/icu:icuuc",
+    "//url",
   ]
 
   if (!is_nacl) {
     deps += [ "//skia" ]
   }
-
-  if (!is_nacl_nonsfi) {
-    deps += [ "//url" ]
-  }
 }
 
 component("shared_impl") {
@@ -232,6 +229,7 @@ component("shared_impl") {
   ]
 
   deps = [
+    "//base/third_party/dynamic_annotations",
     "//build:chromeos_buildflags",
     "//device/gamepad/public/cpp:shared_with_blink",
     "//gpu/command_buffer/client",
@@ -250,10 +248,6 @@ component("shared_impl") {
     ]
   }
 
-  if (!is_nacl_nonsfi) {
-    deps += [ "//base/third_party/dynamic_annotations" ]
-  }
-
   if (is_mac) {
     frameworks = [ "QuartzCore.framework" ]
   }
diff --git a/chromium/ppapi/shared_impl/array_var.h b/chromium/ppapi/shared_impl/array_var.h
index bce84168136..a05589101d3 100644
--- a/chromium/ppapi/shared_impl/array_var.h
+++ b/chromium/ppapi/shared_impl/array_var.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
@@ -24,6 +23,9 @@ class PPAPI_SHARED_EXPORT ArrayVar : public Var {
 
   ArrayVar();
 
+  ArrayVar(const ArrayVar&) = delete;
+  ArrayVar& operator=(const ArrayVar&) = delete;
+
   // Helper function that converts a PP_Var to an ArrayVar. This will return
   // NULL if the PP_Var is not of type PP_VARTYPE_ARRAY or the array cannot be
   // found from the var tracker.
@@ -48,8 +50,6 @@ class PPAPI_SHARED_EXPORT ArrayVar : public Var {
 
  private:
   ElementVector elements_;
-
-  DISALLOW_COPY_AND_ASSIGN(ArrayVar);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/array_writer.h b/chromium/ppapi/shared_impl/array_writer.h
index e97ed5240c2..d08834ac48d 100644
--- a/chromium/ppapi/shared_impl/array_writer.h
+++ b/chromium/ppapi/shared_impl/array_writer.h
@@ -10,7 +10,6 @@
 
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_resource.h"
diff --git a/chromium/ppapi/shared_impl/callback_tracker.h b/chromium/ppapi/shared_impl/callback_tracker.h
index 3b910380e7b..c684be046a6 100644
--- a/chromium/ppapi/shared_impl/callback_tracker.h
+++ b/chromium/ppapi/shared_impl/callback_tracker.h
@@ -8,7 +8,6 @@
 #include <map>
 #include <set>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "ppapi/c/pp_resource.h"
@@ -73,6 +72,9 @@ class PPAPI_SHARED_EXPORT CallbackTracker
  public:
   CallbackTracker();
 
+  CallbackTracker(const CallbackTracker&) = delete;
+  CallbackTracker& operator=(const CallbackTracker&) = delete;
+
   // Abort all callbacks (synchronously).
   void AbortAll();
 
@@ -103,8 +105,6 @@ class PPAPI_SHARED_EXPORT CallbackTracker
   bool abort_all_called_;
 
   base::Lock lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(CallbackTracker);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/dictionary_var.h b/chromium/ppapi/shared_impl/dictionary_var.h
index d6b610a197a..66377413831 100644
--- a/chromium/ppapi/shared_impl/dictionary_var.h
+++ b/chromium/ppapi/shared_impl/dictionary_var.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
@@ -23,6 +22,9 @@ class PPAPI_SHARED_EXPORT DictionaryVar : public Var {
 
   DictionaryVar();
 
+  DictionaryVar(const DictionaryVar&) = delete;
+  DictionaryVar& operator=(const DictionaryVar&) = delete;
+
   // Helper function that converts a PP_Var to a DictionaryVar. This will
   // return NULL if the PP_Var is not of type PP_VARTYPE_DICTIONARY or the
   // dictionary cannot be found from the var tracker.
@@ -52,8 +54,6 @@ class PPAPI_SHARED_EXPORT DictionaryVar : public Var {
 
  private:
   KeyValueMap key_value_map_;
-
-  DISALLOW_COPY_AND_ASSIGN(DictionaryVar);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/file_io_state_manager.h b/chromium/ppapi/shared_impl/file_io_state_manager.h
index beb27af6b94..3ccafe60c58 100644
--- a/chromium/ppapi/shared_impl/file_io_state_manager.h
+++ b/chromium/ppapi/shared_impl/file_io_state_manager.h
@@ -6,7 +6,6 @@
 #define PPAPI_SHARED_IMPL_FILE_IO_STATE_MANAGER_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
diff --git a/chromium/ppapi/shared_impl/file_system_util.cc b/chromium/ppapi/shared_impl/file_system_util.cc
index b2f46aef663..7a243c58e66 100644
--- a/chromium/ppapi/shared_impl/file_system_util.cc
+++ b/chromium/ppapi/shared_impl/file_system_util.cc
@@ -7,7 +7,6 @@
 #include <ostream>
 
 #include "base/notreached.h"
-#include "ppapi/shared_impl/ppapi_constants.h"
 
 namespace ppapi {
 
@@ -28,8 +27,6 @@ std::string IsolatedFileSystemTypeToRootName(
   switch (type) {
     case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
       return "crxfs";
-    case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE:
-      return kPluginPrivateRootName;
     default:
       NOTREACHED() << type;
       return std::string();
diff --git a/chromium/ppapi/shared_impl/media_stream_buffer_manager.h b/chromium/ppapi/shared_impl/media_stream_buffer_manager.h
index 259effc1ba6..4ce79472ea6 100644
--- a/chromium/ppapi/shared_impl/media_stream_buffer_manager.h
+++ b/chromium/ppapi/shared_impl/media_stream_buffer_manager.h
@@ -12,7 +12,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/containers/circular_deque.h"
-#include "base/macros.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/chromium/ppapi/shared_impl/ppapi_constants.h b/chromium/ppapi/shared_impl/ppapi_constants.h
index a6bdb2e8fac..1aa54b19147 100644
--- a/chromium/ppapi/shared_impl/ppapi_constants.h
+++ b/chromium/ppapi/shared_impl/ppapi_constants.h
@@ -18,9 +18,6 @@ const char kCorbTestPluginName[] = "corb_test_plugin.plugin";
 const char kCorbTestPluginName[] = "libcorb_test_plugin.so";
 #endif
 
-// Name of the root directory in the plugin private file system.
-const char kPluginPrivateRootName[] = "pluginprivate";
-
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PPAPI_CONSTANTS_H_
diff --git a/chromium/ppapi/shared_impl/ppapi_globals.cc b/chromium/ppapi/shared_impl/ppapi_globals.cc
index 012303361ec..382cda081a1 100644
--- a/chromium/ppapi/shared_impl/ppapi_globals.cc
+++ b/chromium/ppapi/shared_impl/ppapi_globals.cc
@@ -6,7 +6,7 @@
 
 #include "base/check.h"
 #include "base/lazy_instance.h"  // For testing purposes only.
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_local.h"  // For testing purposes only.
 #include "base/threading/thread_task_runner_handle.h"
 
diff --git a/chromium/ppapi/shared_impl/ppapi_globals.h b/chromium/ppapi/shared_impl/ppapi_globals.h
index 0dbeddd2138..c770c6981e1 100644
--- a/chromium/ppapi/shared_impl/ppapi_globals.h
+++ b/chromium/ppapi/shared_impl/ppapi_globals.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_local.h"  // For testing purposes only.
 #include "ppapi/c/pp_instance.h"
diff --git a/chromium/ppapi/shared_impl/ppb_audio_config_shared.h b/chromium/ppapi/shared_impl/ppb_audio_config_shared.h
index 3149dd36f97..33e32ab9c77 100644
--- a/chromium/ppapi/shared_impl/ppb_audio_config_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_audio_config_shared.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 
diff --git a/chromium/ppapi/shared_impl/ppb_audio_shared.h b/chromium/ppapi/shared_impl/ppb_audio_shared.h
index cd21d1d49ba..aa59c85d057 100644
--- a/chromium/ppapi/shared_impl/ppb_audio_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_audio_shared.h
@@ -10,7 +10,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/sync_socket.h"
 #include "base/threading/simple_thread.h"
diff --git a/chromium/ppapi/shared_impl/ppb_device_ref_shared.h b/chromium/ppapi/shared_impl/ppb_device_ref_shared.h
index 6a148815424..97755340718 100644
--- a/chromium/ppapi/shared_impl/ppb_device_ref_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_device_ref_shared.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_device_ref_api.h"
 
@@ -33,10 +32,15 @@ class PPAPI_SHARED_EXPORT PPB_DeviceRef_Shared
     : public Resource,
       public thunk::PPB_DeviceRef_API {
  public:
+  PPB_DeviceRef_Shared() = delete;
+
   PPB_DeviceRef_Shared(ResourceObjectType type,
                        PP_Instance instance,
                        const DeviceRefData& data);
 
+  PPB_DeviceRef_Shared(const PPB_DeviceRef_Shared&) = delete;
+  PPB_DeviceRef_Shared& operator=(const PPB_DeviceRef_Shared&) = delete;
+
   // Resource overrides.
   PPB_DeviceRef_API* AsPPB_DeviceRef_API() override;
 
@@ -47,8 +51,6 @@ class PPAPI_SHARED_EXPORT PPB_DeviceRef_Shared
 
  private:
   DeviceRefData data_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(PPB_DeviceRef_Shared);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/ppb_graphics_3d_shared.h b/chromium/ppapi/shared_impl/ppb_graphics_3d_shared.h
index c72b33fa8b7..fb6bdea59bf 100644
--- a/chromium/ppapi/shared_impl/ppb_graphics_3d_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_graphics_3d_shared.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/resource.h"
@@ -34,6 +33,9 @@ class PPAPI_SHARED_EXPORT PPB_Graphics3D_Shared
     : public Resource,
       public thunk::PPB_Graphics3D_API {
  public:
+  PPB_Graphics3D_Shared(const PPB_Graphics3D_Shared&) = delete;
+  PPB_Graphics3D_Shared& operator=(const PPB_Graphics3D_Shared&) = delete;
+
   // Resource overrides.
   thunk::PPB_Graphics3D_API* AsPPB_Graphics3D_API() override;
 
@@ -91,8 +93,6 @@ class PPAPI_SHARED_EXPORT PPB_Graphics3D_Shared
 
   // Callback that needs to be executed when swap-buffers is completed.
   scoped_refptr<TrackedCallback> swap_callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Shared);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/ppb_input_event_shared.h b/chromium/ppapi/shared_impl/ppb_input_event_shared.h
index 4df9e94540f..0d595913ebd 100644
--- a/chromium/ppapi/shared_impl/ppb_input_event_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_input_event_shared.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_input_event_api.h"
@@ -71,10 +70,15 @@ class PPAPI_SHARED_EXPORT PPB_InputEvent_Shared
     : public Resource,
       public thunk::PPB_InputEvent_API {
  public:
+  PPB_InputEvent_Shared() = delete;
+
   PPB_InputEvent_Shared(ResourceObjectType type,
                         PP_Instance instance,
                         const InputEventData& data);
 
+  PPB_InputEvent_Shared(const PPB_InputEvent_Shared&) = delete;
+  PPB_InputEvent_Shared& operator=(const PPB_InputEvent_Shared&) = delete;
+
   // Resource overrides.
   PPB_InputEvent_API* AsPPB_InputEvent_API() override;
 
@@ -155,8 +159,6 @@ class PPAPI_SHARED_EXPORT PPB_InputEvent_Shared
   TouchPointWithTilt* GetTouchByTypeAndId(PP_TouchListType type, uint32_t id);
 
   InputEventData data_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(PPB_InputEvent_Shared);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/ppb_message_loop_shared.h b/chromium/ppapi/shared_impl/ppb_message_loop_shared.h
index a2086c54bc4..5b3301828c0 100644
--- a/chromium/ppapi/shared_impl/ppb_message_loop_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_message_loop_shared.h
@@ -9,7 +9,6 @@
 
 #include "base/callback_forward.h"
 #include "base/location.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/resource.h"
diff --git a/chromium/ppapi/shared_impl/ppb_url_util_shared.cc b/chromium/ppapi/shared_impl/ppb_url_util_shared.cc
index 0e90f2f2ad5..f0c06b207bb 100644
--- a/chromium/ppapi/shared_impl/ppb_url_util_shared.cc
+++ b/chromium/ppapi/shared_impl/ppb_url_util_shared.cc
@@ -83,7 +83,9 @@ PP_Bool PPB_URLUtil_Shared::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) {
   if (!gurl_a.is_valid() || !gurl_b.is_valid())
     return PP_FALSE;
 
-  return gurl_a.GetOrigin() == gurl_b.GetOrigin() ? PP_TRUE : PP_FALSE;
+  return gurl_a.DeprecatedGetOriginAsURL() == gurl_b.DeprecatedGetOriginAsURL()
+             ? PP_TRUE
+             : PP_FALSE;
 }
 
 // Used for returning the given GURL from a PPAPI function, with an optional
diff --git a/chromium/ppapi/shared_impl/ppb_video_decoder_shared.h b/chromium/ppapi/shared_impl/ppb_video_decoder_shared.h
index d6bd67eb774..3c23f193e97 100644
--- a/chromium/ppapi/shared_impl/ppb_video_decoder_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_video_decoder_shared.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/tracked_callback.h"
diff --git a/chromium/ppapi/shared_impl/ppb_view_shared.h b/chromium/ppapi/shared_impl/ppb_view_shared.h
index fb87e69f668..1b6848c40d6 100644
--- a/chromium/ppapi/shared_impl/ppb_view_shared.h
+++ b/chromium/ppapi/shared_impl/ppb_view_shared.h
@@ -6,7 +6,6 @@
 #define PPAPI_SHARED_IMPL_PPB_VIEW_SHARED_H_
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/shared_impl/resource.h"
diff --git a/chromium/ppapi/shared_impl/ppp_instance_combined.h b/chromium/ppapi/shared_impl/ppp_instance_combined.h
index 4645f051627..8e27a2164e7 100644
--- a/chromium/ppapi/shared_impl/ppp_instance_combined.h
+++ b/chromium/ppapi/shared_impl/ppp_instance_combined.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
@@ -25,6 +24,9 @@ struct PPAPI_SHARED_EXPORT PPP_Instance_Combined {
   static PPP_Instance_Combined* Create(
       base::RepeatingCallback<const void*(const char*)> get_plugin_if);
 
+  PPP_Instance_Combined(const PPP_Instance_Combined&) = delete;
+  PPP_Instance_Combined& operator=(const PPP_Instance_Combined&) = delete;
+
   PP_Bool DidCreate(PP_Instance instance,
                     uint32_t argc,
                     const char* argn[],
@@ -55,8 +57,6 @@ struct PPAPI_SHARED_EXPORT PPP_Instance_Combined {
   void (*did_change_view_1_0_)(PP_Instance instance,
                                const struct PP_Rect* position,
                                const struct PP_Rect* clip);
-
-  DISALLOW_COPY_AND_ASSIGN(PPP_Instance_Combined);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/private/net_address_private_impl.h b/chromium/ppapi/shared_impl/private/net_address_private_impl.h
index dcd8ce95353..5516b408035 100644
--- a/chromium/ppapi/shared_impl/private/net_address_private_impl.h
+++ b/chromium/ppapi/shared_impl/private/net_address_private_impl.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 #include <string>
 
-#include "base/macros.h"
 #include "net/base/ip_address.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/ppb_net_address.h"
@@ -21,6 +20,10 @@ namespace ppapi {
 
 class PPAPI_SHARED_EXPORT NetAddressPrivateImpl {
  public:
+  NetAddressPrivateImpl() = delete;
+  NetAddressPrivateImpl(const NetAddressPrivateImpl&) = delete;
+  NetAddressPrivateImpl& operator=(const NetAddressPrivateImpl&) = delete;
+
   static bool ValidateNetAddress(const PP_NetAddress_Private& addr);
 
   static bool SockaddrToNetAddress(const sockaddr* sa,
@@ -60,9 +63,6 @@ class PPAPI_SHARED_EXPORT NetAddressPrivateImpl {
       PP_NetAddress_IPv6* ipv6_addr);
 
   static const PP_NetAddress_Private kInvalidNetAddress;
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(NetAddressPrivateImpl);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h b/chromium/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
index 2f852e5a0ab..d0205f3bc01 100644
--- a/chromium/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
+++ b/chromium/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
@@ -10,7 +10,6 @@
 #include <memory>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/values.h"
 #include "ppapi/c/private/ppb_x509_certificate_private.h"
 #include "ppapi/shared_impl/resource.h"
diff --git a/chromium/ppapi/shared_impl/proxy_lock.h b/chromium/ppapi/shared_impl/proxy_lock.h
index 24d8cfb4737..1165f645a99 100644
--- a/chromium/ppapi/shared_impl/proxy_lock.h
+++ b/chromium/ppapi/shared_impl/proxy_lock.h
@@ -10,7 +10,6 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
@@ -34,6 +33,10 @@ namespace ppapi {
 // tracker, etc.
 class PPAPI_SHARED_EXPORT ProxyLock {
  public:
+  ProxyLock() = delete;
+  ProxyLock(const ProxyLock&) = delete;
+  ProxyLock& operator=(const ProxyLock&) = delete;
+
   // Return the global ProxyLock. Normally, you should not access this
   // directly but instead use ProxyAutoLock or ProxyAutoUnlock. But sometimes
   // you need access to the ProxyLock, for example to create a condition
@@ -73,8 +76,6 @@ class PPAPI_SHARED_EXPORT ProxyLock {
   // startup, before other threads that may access the ProxyLock have had a
   // chance to run.
   static void DisableLocking();
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyLock);
 };
 
 // A simple RAII class for locking the PPAPI proxy lock on entry and releasing
diff --git a/chromium/ppapi/shared_impl/proxy_lock_unittest.cc b/chromium/ppapi/shared_impl/proxy_lock_unittest.cc
index 9abcf0fa6d7..202130755a8 100644
--- a/chromium/ppapi/shared_impl/proxy_lock_unittest.cc
+++ b/chromium/ppapi/shared_impl/proxy_lock_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/task_environment.h"
 #include "ppapi/shared_impl/proxy_lock.h"
@@ -35,12 +34,16 @@ class CheckLockStateInDestructor
     : public base::RefCounted<CheckLockStateInDestructor> {
  public:
   CheckLockStateInDestructor() {}
+
+  CheckLockStateInDestructor(const CheckLockStateInDestructor&) = delete;
+  CheckLockStateInDestructor& operator=(const CheckLockStateInDestructor&) =
+      delete;
+
   void Method() { ++called_num; }
 
  private:
   friend class base::RefCounted<CheckLockStateInDestructor>;
   ~CheckLockStateInDestructor() { CheckLockState(); }
-  DISALLOW_COPY_AND_ASSIGN(CheckLockStateInDestructor);
 };
 
 void TestCallback_0() {
diff --git a/chromium/ppapi/shared_impl/resource.h b/chromium/ppapi/shared_impl/resource.h
index 6ba1097a330..e5df24e75fb 100644
--- a/chromium/ppapi/shared_impl/resource.h
+++ b/chromium/ppapi/shared_impl/resource.h
@@ -9,7 +9,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
@@ -106,6 +105,8 @@ enum ResourceObjectType { OBJECT_IS_IMPL, OBJECT_IS_PROXY };
 class PPAPI_SHARED_EXPORT Resource
     : public base::RefCountedThreadSafe<Resource> {
  public:
+  Resource() = delete;
+
   // Constructor for impl and non-proxied, instance-only objects.
   //
   // For constructing "impl" (non-proxied) objects, this just takes the
@@ -140,6 +141,9 @@ class PPAPI_SHARED_EXPORT Resource
   struct Untracked {};
   explicit Resource(Untracked);
 
+  Resource(const Resource&) = delete;
+  Resource& operator=(const Resource&) = delete;
+
   virtual ~Resource();
 
   PP_Instance pp_instance() const { return host_resource_.instance(); }
@@ -228,8 +232,6 @@ class PPAPI_SHARED_EXPORT Resource
   // See the getters above.
   PP_Resource pp_resource_;
   HostResource host_resource_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(Resource);
 };
 
 // Template-based dynamic casting. These specializations forward to the
diff --git a/chromium/ppapi/shared_impl/resource_tracker.h b/chromium/ppapi/shared_impl/resource_tracker.h
index 373090f71c5..1adb81075fa 100644
--- a/chromium/ppapi/shared_impl/resource_tracker.h
+++ b/chromium/ppapi/shared_impl/resource_tracker.h
@@ -11,7 +11,6 @@
 #include <set>
 #include <unordered_map>
 
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_checker_impl.h"
diff --git a/chromium/ppapi/shared_impl/resource_var.h b/chromium/ppapi/shared_impl/resource_var.h
index fe48120d7b2..f328d33aa45 100644
--- a/chromium/ppapi/shared_impl/resource_var.h
+++ b/chromium/ppapi/shared_impl/resource_var.h
@@ -5,7 +5,6 @@
 #ifndef PPAPI_SHARED_IMPL_RESOURCE_VAR_H_
 #define PPAPI_SHARED_IMPL_RESOURCE_VAR_H_
 
-#include "base/macros.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
@@ -20,6 +19,9 @@ namespace ppapi {
 // Represents a resource Var.
 class PPAPI_SHARED_EXPORT ResourceVar : public Var {
  public:
+  ResourceVar(const ResourceVar&) = delete;
+  ResourceVar& operator=(const ResourceVar&) = delete;
+
   // Gets the resource ID associated with this var.
   // This is 0 if a resource is still pending (only possible on the host side).
   // NOTE: This can return a PP_Resource with a reference count of 0 on the
@@ -53,9 +55,6 @@ class PPAPI_SHARED_EXPORT ResourceVar : public Var {
   ResourceVar();
 
   ~ResourceVar() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ResourceVar);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/scoped_pp_var.h b/chromium/ppapi/shared_impl/scoped_pp_var.h
index 6e8899c765a..86fa6d53398 100644
--- a/chromium/ppapi/shared_impl/scoped_pp_var.h
+++ b/chromium/ppapi/shared_impl/scoped_pp_var.h
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "base/macros.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
diff --git a/chromium/ppapi/shared_impl/test_globals.h b/chromium/ppapi/shared_impl/test_globals.h
index 89a4d852dee..a2001952b5e 100644
--- a/chromium/ppapi/shared_impl/test_globals.h
+++ b/chromium/ppapi/shared_impl/test_globals.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
diff --git a/chromium/ppapi/shared_impl/thread_aware_callback.h b/chromium/ppapi/shared_impl/thread_aware_callback.h
index 9cc3ed31524..e2eb19cff1d 100644
--- a/chromium/ppapi/shared_impl/thread_aware_callback.h
+++ b/chromium/ppapi/shared_impl/thread_aware_callback.h
@@ -6,7 +6,6 @@
 #define PPAPI_SHARED_IMPL_THREAD_AWARE_CALLBACK_H_
 
 #include "base/bind.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/proxy_lock.h"
@@ -18,6 +17,10 @@ class MessageLoopShared;
 namespace internal {
 
 class PPAPI_SHARED_EXPORT ThreadAwareCallbackBase {
+ public:
+  ThreadAwareCallbackBase(const ThreadAwareCallbackBase&) = delete;
+  ThreadAwareCallbackBase& operator=(const ThreadAwareCallbackBase&) = delete;
+
  protected:
   ThreadAwareCallbackBase();
   ~ThreadAwareCallbackBase();
@@ -31,8 +34,6 @@ class PPAPI_SHARED_EXPORT ThreadAwareCallbackBase {
 
   scoped_refptr<MessageLoopShared> target_loop_;
   scoped_refptr<Core> core_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThreadAwareCallbackBase);
 };
 
 }  // namespace internal
diff --git a/chromium/ppapi/shared_impl/thread_aware_callback_unittest.cc b/chromium/ppapi/shared_impl/thread_aware_callback_unittest.cc
index 42adaf92592..05cb4032083 100644
--- a/chromium/ppapi/shared_impl/thread_aware_callback_unittest.cc
+++ b/chromium/ppapi/shared_impl/thread_aware_callback_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/check.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/ppapi_proxy_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromium/ppapi/shared_impl/tracked_callback.cc b/chromium/ppapi/shared_impl/tracked_callback.cc
index 9984dbbf663..6e1e1954731 100644
--- a/chromium/ppapi/shared_impl/tracked_callback.cc
+++ b/chromium/ppapi/shared_impl/tracked_callback.cc
@@ -11,8 +11,8 @@
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/notreached.h"
-#include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/chromium/ppapi/shared_impl/tracked_callback.h b/chromium/ppapi/shared_impl/tracked_callback.h
index a3feb4f536f..ab04408b1c7 100644
--- a/chromium/ppapi/shared_impl/tracked_callback.h
+++ b/chromium/ppapi/shared_impl/tracked_callback.h
@@ -12,7 +12,6 @@
 #include <set>
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
@@ -66,11 +65,16 @@ class EnterBase;
 class PPAPI_SHARED_EXPORT TrackedCallback
     : public base::RefCountedThreadSafe<TrackedCallback> {
  public:
+  TrackedCallback() = delete;
+
   // Create a tracked completion callback and register it with the tracker. The
   // resource pointer is not stored. If |resource| is NULL, this callback will
   // not be added to the callback tracker.
   TrackedCallback(Resource* resource, const PP_CompletionCallback& callback);
 
+  TrackedCallback(const TrackedCallback&) = delete;
+  TrackedCallback& operator=(const TrackedCallback&) = delete;
+
   // These run the callback in an abortive manner, or post a task to do so (but
   // immediately marking the callback as to be aborted).
   void Abort();
@@ -193,8 +197,6 @@ class PPAPI_SHARED_EXPORT TrackedCallback
   // callback. Note that in-process, there is no lock, blocking callbacks are
   // not allowed, and therefore this pointer will be NULL.
   std::unique_ptr<base::ConditionVariable> operation_completed_condvar_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(TrackedCallback);
 };
 
 }  // namespace ppapi
diff --git a/chromium/ppapi/shared_impl/var.h b/chromium/ppapi/shared_impl/var.h
index 2e726c824ec..979ad1ec986 100644
--- a/chromium/ppapi/shared_impl/var.h
+++ b/chromium/ppapi/shared_impl/var.h
@@ -10,7 +10,6 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "ppapi/c/pp_var.h"
@@ -33,6 +32,9 @@ class VarTracker;
 // Represents a non-POD var.
 class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> {
  public:
+  Var(const Var&) = delete;
+  Var& operator=(const Var&) = delete;
+
   // Returns a string representing the given var for logging purposes.
   static std::string PPVarToLogString(PP_Var var);
 
@@ -84,8 +86,6 @@ class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> {
  private:
   // This will be 0 if no ID has been assigned (this happens lazily).
   int32_t var_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(Var);
 };
 
 // StringVar -------------------------------------------------------------------
diff --git a/chromium/ppapi/shared_impl/var_tracker.h b/chromium/ppapi/shared_impl/var_tracker.h
index 54b3cb26d50..33c4475481c 100644
--- a/chromium/ppapi/shared_impl/var_tracker.h
+++ b/chromium/ppapi/shared_impl/var_tracker.h
@@ -11,7 +11,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/threading/thread_checker.h"
diff --git a/chromium/ppapi/tests/extensions/BUILD.gn b/chromium/ppapi/tests/extensions/BUILD.gn
index 1abf250845d..712e9185b7c 100644
--- a/chromium/ppapi/tests/extensions/BUILD.gn
+++ b/chromium/ppapi/tests/extensions/BUILD.gn
@@ -19,14 +19,9 @@ group("extensions") {
     ":ppapi_tests_extensions_popup($newlib)",
     ":ppapi_tests_extensions_socket_permissions($newlib)",
   ]
-  if ((target_cpu == "x86" || target_cpu == "x64") && (is_linux || is_chromeos) &&
-      enable_nacl_nonsfi) {
-    nonsfi = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
-    data_deps += [ ":ppapi_tests_extensions_packaged_app($nonsfi)" ]
-  }
 }
 
-if (is_nacl && !is_nacl_nonsfi) {
+if (is_nacl) {
   nacl_test_data("ppapi_tests_extensions_background_keepalive") {
     sources = [ "background_keepalive/background.cc" ]
     deps = [ "//ppapi/cpp" ]
@@ -116,10 +111,12 @@ if (is_nacl && !is_nacl_nonsfi) {
 if (is_nacl) {
   nacl_test_data("ppapi_tests_extensions_packaged_app") {
     sources = [ "packaged_app/test_packaged_app.cc" ]
-    deps = [
-      "//ipc:message_support",
-      "//ppapi/cpp",
-    ]
+    deps = [ "//ppapi/cpp" ]
+
+    # This is built with an old nacl toolchain, so it shouldn't pull in
+    # any of chrome's "actual" code.
+    assert_no_deps = [ "//base" ]
+
     destination_dir = "test_data/ppapi/tests/extensions/packaged_app"
     test_files = [
       "packaged_app/controller.js",
@@ -130,9 +127,10 @@ if (is_nacl) {
       "packaged_app/test_file2.txt",
     ]
     nmfflags = [
-      # Add 129 "files" entries to make sure that open_resource can handle
+      # Add 16 "files" entries to make sure that open_resource can handle
       # more files than IPC::MessageAttachmentSet::kMaxDescriptorsPerMessage
-      # which is currently 128.
+      # which is currently 7 (also 16 is a large-but-reasonable number of
+      # possible DSOs for an app to have)
       "-xtest_file0:test_file.txt",
       "-xtest_file1:test_file2.txt",
       "-xtest_file2:test_file.txt",
@@ -150,118 +148,6 @@ if (is_nacl) {
       "-xtest_file14:test_file.txt",
       "-xtest_file15:test_file2.txt",
       "-xtest_file16:test_file.txt",
-      "-xtest_file17:test_file2.txt",
-      "-xtest_file18:test_file.txt",
-      "-xtest_file19:test_file2.txt",
-      "-xtest_file20:test_file.txt",
-      "-xtest_file21:test_file2.txt",
-      "-xtest_file22:test_file.txt",
-      "-xtest_file23:test_file2.txt",
-      "-xtest_file24:test_file.txt",
-      "-xtest_file25:test_file2.txt",
-      "-xtest_file26:test_file.txt",
-      "-xtest_file27:test_file2.txt",
-      "-xtest_file28:test_file.txt",
-      "-xtest_file29:test_file2.txt",
-      "-xtest_file30:test_file.txt",
-      "-xtest_file31:test_file2.txt",
-      "-xtest_file32:test_file.txt",
-      "-xtest_file33:test_file2.txt",
-      "-xtest_file34:test_file.txt",
-      "-xtest_file35:test_file2.txt",
-      "-xtest_file36:test_file.txt",
-      "-xtest_file37:test_file2.txt",
-      "-xtest_file38:test_file.txt",
-      "-xtest_file39:test_file2.txt",
-      "-xtest_file40:test_file.txt",
-      "-xtest_file41:test_file2.txt",
-      "-xtest_file42:test_file.txt",
-      "-xtest_file43:test_file2.txt",
-      "-xtest_file44:test_file.txt",
-      "-xtest_file45:test_file2.txt",
-      "-xtest_file46:test_file.txt",
-      "-xtest_file47:test_file2.txt",
-      "-xtest_file48:test_file.txt",
-      "-xtest_file49:test_file2.txt",
-      "-xtest_file50:test_file.txt",
-      "-xtest_file51:test_file2.txt",
-      "-xtest_file52:test_file.txt",
-      "-xtest_file53:test_file2.txt",
-      "-xtest_file54:test_file.txt",
-      "-xtest_file55:test_file2.txt",
-      "-xtest_file56:test_file.txt",
-      "-xtest_file57:test_file2.txt",
-      "-xtest_file58:test_file.txt",
-      "-xtest_file59:test_file2.txt",
-      "-xtest_file60:test_file.txt",
-      "-xtest_file61:test_file2.txt",
-      "-xtest_file62:test_file.txt",
-      "-xtest_file63:test_file2.txt",
-      "-xtest_file64:test_file.txt",
-      "-xtest_file65:test_file2.txt",
-      "-xtest_file66:test_file.txt",
-      "-xtest_file67:test_file2.txt",
-      "-xtest_file68:test_file.txt",
-      "-xtest_file69:test_file2.txt",
-      "-xtest_file70:test_file.txt",
-      "-xtest_file71:test_file2.txt",
-      "-xtest_file72:test_file.txt",
-      "-xtest_file73:test_file2.txt",
-      "-xtest_file74:test_file.txt",
-      "-xtest_file75:test_file2.txt",
-      "-xtest_file76:test_file.txt",
-      "-xtest_file77:test_file2.txt",
-      "-xtest_file78:test_file.txt",
-      "-xtest_file79:test_file2.txt",
-      "-xtest_file80:test_file.txt",
-      "-xtest_file81:test_file2.txt",
-      "-xtest_file82:test_file.txt",
-      "-xtest_file83:test_file2.txt",
-      "-xtest_file84:test_file.txt",
-      "-xtest_file85:test_file2.txt",
-      "-xtest_file86:test_file.txt",
-      "-xtest_file87:test_file2.txt",
-      "-xtest_file88:test_file.txt",
-      "-xtest_file89:test_file2.txt",
-      "-xtest_file90:test_file.txt",
-      "-xtest_file91:test_file2.txt",
-      "-xtest_file92:test_file.txt",
-      "-xtest_file93:test_file2.txt",
-      "-xtest_file94:test_file.txt",
-      "-xtest_file95:test_file2.txt",
-      "-xtest_file96:test_file.txt",
-      "-xtest_file97:test_file2.txt",
-      "-xtest_file98:test_file.txt",
-      "-xtest_file99:test_file2.txt",
-      "-xtest_file100:test_file.txt",
-      "-xtest_file101:test_file2.txt",
-      "-xtest_file102:test_file.txt",
-      "-xtest_file103:test_file2.txt",
-      "-xtest_file104:test_file.txt",
-      "-xtest_file105:test_file2.txt",
-      "-xtest_file106:test_file.txt",
-      "-xtest_file107:test_file2.txt",
-      "-xtest_file108:test_file.txt",
-      "-xtest_file109:test_file2.txt",
-      "-xtest_file110:test_file.txt",
-      "-xtest_file111:test_file2.txt",
-      "-xtest_file112:test_file.txt",
-      "-xtest_file113:test_file2.txt",
-      "-xtest_file114:test_file.txt",
-      "-xtest_file115:test_file2.txt",
-      "-xtest_file116:test_file.txt",
-      "-xtest_file117:test_file2.txt",
-      "-xtest_file118:test_file.txt",
-      "-xtest_file119:test_file2.txt",
-      "-xtest_file120:test_file.txt",
-      "-xtest_file121:test_file2.txt",
-      "-xtest_file122:test_file.txt",
-      "-xtest_file123:test_file2.txt",
-      "-xtest_file124:test_file.txt",
-      "-xtest_file125:test_file2.txt",
-      "-xtest_file126:test_file.txt",
-      "-xtest_file127:test_file2.txt",
-      "-xtest_file128:test_file.txt",
     ]
   }
 }
diff --git a/chromium/ppapi/thunk/enter.cc b/chromium/ppapi/thunk/enter.cc
index b774cdd83bd..2dfd8fa6588 100644
--- a/chromium/ppapi/thunk/enter.cc
+++ b/chromium/ppapi/thunk/enter.cc
@@ -6,9 +6,9 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
+#include "base/task/single_thread_task_runner.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/tracked_callback.h"
diff --git a/chromium/ppapi/thunk/enter.h b/chromium/ppapi/thunk/enter.h
index 43b0d868e3b..38290571735 100644
--- a/chromium/ppapi/thunk/enter.h
+++ b/chromium/ppapi/thunk/enter.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
diff --git a/chromium/ppapi/tools/pepper_hash_for_uma.cc b/chromium/ppapi/tools/pepper_hash_for_uma.cc
index bb2706c0c0c..2fb9196e25a 100644
--- a/chromium/ppapi/tools/pepper_hash_for_uma.cc
+++ b/chromium/ppapi/tools/pepper_hash_for_uma.cc
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include "base/hash/hash.h"
-#include "base/macros.h"
 
 int main(int argc, char **argv) {
   if (argc < 2) {
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-02-04 17:20:24 +0100
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-02-12 08:15:25 +0000
commit	8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch)
tree	788d8d7549712682703a0310ca4a0f0860d4802b /chromium/ppapi
parent	606d85f2a5386472314d39923da28c70c60dc8e7 (diff)
download	qtwebengine-chromium-8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b.tar.gz