Update Crashpad to b4095401639ebe2ad33169e5c1d994065cbff1b8

third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc

Index: third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc
diff --git a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc
index f791f80eb9af3f7957f5f698ad630687032eed12..02a61232f0f8fbb1f09bc65a5a8ab633a0d52588 100644
--- a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc
+++ b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc
@@ -29,7 +29,7 @@
 #include "gtest/gtest.h"
 #include "snapshot/win/pe_image_reader.h"
 #include "snapshot/win/process_reader_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"
@@ -49,7 +49,7 @@ enum TestType {
 void TestAnnotationsOnCrash(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)
@@ -86,11 +86,11 @@ void TestAnnotationsOnCrash(TestType type,
   }
 
   EXPECT_GE(all_annotations_simple_map.size(), 5u);
-  EXPECT_EQ("crash", all_annotations_simple_map["#TEST# pad"]);
-  EXPECT_EQ("value", all_annotations_simple_map["#TEST# key"]);
-  EXPECT_EQ("y", all_annotations_simple_map["#TEST# x"]);
-  EXPECT_EQ("shorter", all_annotations_simple_map["#TEST# longer"]);
-  EXPECT_EQ("", all_annotations_simple_map["#TEST# empty_value"]);
+  EXPECT_EQ(all_annotations_simple_map["#TEST# pad"], "crash");
+  EXPECT_EQ(all_annotations_simple_map["#TEST# key"], "value");
+  EXPECT_EQ(all_annotations_simple_map["#TEST# x"], "y");
+  EXPECT_EQ(all_annotations_simple_map["#TEST# longer"], "shorter");
+  EXPECT_EQ(all_annotations_simple_map["#TEST# empty_value"], "");
 
   // Tell the child process to continue.
   DWORD expected_exit_code;
@@ -108,7 +108,7 @@ void TestAnnotationsOnCrash(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(PEImageAnnotationsReader, DontCrash) {