Cleanup some diffs between Chromium and Crashpad.

Some header changes (page_size), formatting and exception processor
cast changes.

Change-Id: Id1d2dd99ee6d82b5322692894e4e12e96fcac030
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2936663
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>

DEPS

@@ -42,7 +42,7 @@ deps = {
       '7bde79cc274d06451bf65ae82c012a5d3e476b5a',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      '2470faf722b0fd259ca11c045fdb370e09037c4e',
+      '9cdc2a7c8415bd880757d2f564edf363f0218fe1',
   'crashpad/third_party/libfuzzer/src':
       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
       'fda403cf93ecb8792cb1d061564d89a6553ca020',

client/annotation.cc

@@ -16,6 +16,7 @@
 
 #include <type_traits>
 
+#include "base/check_op.h"
 #include "client/annotation_list.h"
 
 namespace crashpad {

minidump/minidump_user_stream_writer.cc

@@ -14,6 +14,7 @@
 
 #include "minidump/minidump_user_stream_writer.h"
 
+#include "base/check_op.h"
 #include "util/file/file_writer.h"
 
 namespace crashpad {

test/ios/crash_type_xctest.mm

@@ -49,7 +49,7 @@
 
   // Override EDO default error handler.  Without this, the default EDO error
   // handler will throw an error and fail the test.
-  EDOSetClientErrorHandler(^(NSError* error) {
+  EDOSetClientErrorHandler(^(NSError* error){
       // Do nothing.
   });
 }

test/scoped_guarded_page_posix.cc

@@ -17,7 +17,7 @@
 #include <sys/mman.h>
 
 #include "base/check.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 
 namespace crashpad {
 namespace test {

test/scoped_guarded_page_test.cc

@@ -14,7 +14,7 @@
 
 #include "test/scoped_guarded_page.h"
 
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"
 

test/scoped_guarded_page_win.cc

@@ -17,7 +17,7 @@
 #include <windows.h>
 
 #include "base/check.h"
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 
 namespace crashpad {
 namespace test {

tools/tool_support.cc

@@ -19,6 +19,7 @@
 #include <memory>
 #include <vector>
 
+#include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "package.h"
 
@@ -92,7 +93,7 @@ int ToolSupport::Wmain(int argc, wchar_t* argv[], int (*entry)(int, char* [])) {
 base::FilePath::StringType ToolSupport::CommandLineArgumentToFilePathStringType(
     const base::StringPiece& path) {
 #if defined(OS_POSIX)
-  return path.as_string();
+  return std::string(path.data(), path.size());
 #elif defined(OS_WIN)
   return base::UTF8ToWide(path);
 #endif  // OS_POSIX

util/BUILD.gn

@@ -609,7 +609,10 @@ crashpad_static_library("util") {
     "../third_party/zlib",
   ]
 
-  deps += [ "../third_party/mini_chromium:base" ]
+  deps += [
+    "../third_party/mini_chromium:base",
+    "../third_party/mini_chromium:chromeos_buildflags",
+  ]
 
   if (crashpad_is_mac || crashpad_is_ios) {
     include_dirs += [ "$root_build_dir/gen" ]

util/ios/exception_processor.mm

@@ -300,10 +300,11 @@ id ObjcExceptionPreprocessor(id exception) {
         static IMP gesture_environment_min_imp =
             uigestureimp_lambda(&gesture_environment_max_imp);
 
-        IMP caller = reinterpret_cast<IMP>(caller_frame_info.start_ip);
         if (gesture_environment_min_imp && gesture_environment_max_imp &&
-            caller >= gesture_environment_min_imp &&
+            caller_frame_info.start_ip >=
-            caller <= gesture_environment_max_imp) {
+                reinterpret_cast<unw_word_t>(gesture_environment_min_imp) &&
+            caller_frame_info.start_ip <=
+                reinterpret_cast<unw_word_t>(gesture_environment_max_imp)) {
           TerminatingFromUncaughtNSException(exception,
                                              "_UIGestureEnvironmentUpdate");
         }

util/linux/ptrace_broker.cc

@@ -24,8 +24,8 @@
 #include <algorithm>
 
 #include "base/check_op.h"
+#include "base/memory/page_size.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process/process_metrics.h"
 #include "third_party/lss/lss.h"
 #include "util/linux/scoped_ptrace_attach.h"
 #include "util/misc/memory_sanitizer.h"

util/net/http_body.h

@@ -21,7 +21,6 @@
 #include <string>
 #include <vector>
 
-#include "base/files/file_path.h"
 #include "base/macros.h"
 #include "util/file/file_io.h"
 #include "util/file/file_reader.h"

util/posix/scoped_mmap.cc

@@ -20,18 +20,23 @@
 
 #include "base/check_op.h"
 #include "base/logging.h"
+#include "base/memory/page_size.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/numerics/safe_math.h"
-#include "base/process/process_metrics.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 
-#if defined(OS_LINUX)
+// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+// complete.
+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 #include "third_party/lss/lss.h"
 #endif
 
 namespace {
 
-#if defined(OS_LINUX)
+// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+// complete.
+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 void* CallMmap(void* addr,
                size_t len,
                int prot,

util/process/process_memory_test.cc

@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "base/process/process_metrics.h"
+#include "base/memory/page_size.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"

util/process/process_memory_win.cc

@@ -20,8 +20,8 @@
 #include <limits>
 
 #include "base/logging.h"
+#include "base/memory/page_size.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/process/process_metrics.h"
 #include "base/strings/stringprintf.h"
 
 namespace crashpad {