Update Crashpad to b4095401639ebe2ad33169e5c1d994065cbff1b8

third_party/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc

Index: third_party/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc
diff --git a/third_party/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc b/third_party/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc
index 57d41bb58f67a52a092b9fbd9cea0be40b0f19b3..49d835f0305d65d2be038e1073c47f442f8ca5d4 100644
--- a/third_party/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc
+++ b/third_party/crashpad/crashpad/snapshot/win/extra_memory_ranges_test.cc
@@ -25,7 +25,7 @@
 #include "client/simple_address_range_bag.h"
 #include "gtest/gtest.h"
 #include "snapshot/win/process_snapshot_win.h"
-#include "test/paths.h"
+#include "test/test_paths.h"
 #include "test/win/child_launcher.h"
 #include "util/file/file_io.h"
 #include "util/win/process_info.h"
@@ -45,7 +45,7 @@ enum TestType {
 void TestExtraMemoryRanges(TestType type,
                            const base::string16& directory_modification) {
   // Spawn a child process, passing it the pipe name to connect to.
-  base::FilePath test_executable = Paths::Executable();
+  base::FilePath test_executable = TestPaths::Executable();
   std::wstring child_test_executable =
       test_executable.DirName()
           .Append(directory_modification)
@@ -71,15 +71,15 @@ void TestExtraMemoryRanges(TestType type,
       all_ranges.insert(range);
   }
 
-  EXPECT_EQ(5u, all_ranges.size());
-  EXPECT_NE(all_ranges.end(), all_ranges.find(CheckedRange<uint64_t>(0, 1)));
-  EXPECT_NE(all_ranges.end(), all_ranges.find(CheckedRange<uint64_t>(1, 0)));
-  EXPECT_NE(all_ranges.end(),
-            all_ranges.find(CheckedRange<uint64_t>(1234, 5678)));
-  EXPECT_NE(all_ranges.end(),
-            all_ranges.find(CheckedRange<uint64_t>(0x1000000000ULL, 0x1000)));
-  EXPECT_NE(all_ranges.end(),
-            all_ranges.find(CheckedRange<uint64_t>(0x2000, 0x2000000000ULL)));
+  EXPECT_EQ(all_ranges.size(), 5u);
+  EXPECT_NE(all_ranges.find(CheckedRange<uint64_t>(0, 1)), all_ranges.end());
+  EXPECT_NE(all_ranges.find(CheckedRange<uint64_t>(1, 0)), all_ranges.end());
+  EXPECT_NE(all_ranges.find(CheckedRange<uint64_t>(1234, 5678)),
+            all_ranges.end());
+  EXPECT_NE(all_ranges.find(CheckedRange<uint64_t>(0x1000000000ULL, 0x1000)),
+            all_ranges.end());
+  EXPECT_NE(all_ranges.find(CheckedRange<uint64_t>(0x2000, 0x2000000000ULL)),
+            all_ranges.end());
 
   // Tell the child process to continue.
   DWORD expected_exit_code;
@@ -97,7 +97,7 @@ void TestExtraMemoryRanges(TestType type,
   }
   CheckedWriteFile(child.stdin_write_handle(), &c, sizeof(c));
 
-  EXPECT_EQ(expected_exit_code, child.WaitForExit());
+  EXPECT_EQ(child.WaitForExit(), expected_exit_code);
 }
 
 TEST(ExtraMemoryRanges, DontCrash) {