Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: util/mach/exc_server_variants_test.cc

Issue 649713002: Use the correct null constants for Mach threads, tasks, and hosts (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « util/mach/exc_server_variants.cc ('k') | util/mach/exception_ports.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: util/mach/exc_server_variants_test.cc
diff --git a/util/mach/exc_server_variants_test.cc b/util/mach/exc_server_variants_test.cc
index eea6dce6f8e004525b44e21b77a8337b3fe4cdf7..bdb7e47ab587382fce49d2724cb2818074ce5aaf 100644
--- a/util/mach/exc_server_variants_test.cc
+++ b/util/mach/exc_server_variants_test.cc
@@ -603,8 +603,8 @@ TEST(ExcServerVariants, MockExceptionRaiseState) {
MockCatchMachException(
kExceptionBehavior,
kServerLocalPort,
- MACH_PORT_NULL,
- MACH_PORT_NULL,
+ THREAD_NULL,
+ TASK_NULL,
kExceptionType,
AreExceptionCodes(kTestExceptonCodes[0], kTestExceptonCodes[1]),
Pointee(Eq(kThreadStateFlavor)),
@@ -727,8 +727,8 @@ TEST(ExcServerVariants, MockMachExceptionRaiseState) {
server,
MockCatchMachException(kExceptionBehavior,
kServerLocalPort,
- MACH_PORT_NULL,
- MACH_PORT_NULL,
+ THREAD_NULL,
+ TASK_NULL,
kExceptionType,
AreExceptionCodes(kTestMachExceptionCodes[0],
kTestMachExceptionCodes[1]),
@@ -898,11 +898,11 @@ class TestExcServerVariants : public UniversalMachExcServer,
EXPECT_EQ(LocalPort(), exception_port);
if (ExceptionBehaviorHasIdentity(behavior)) {
- EXPECT_NE(kMachPortNull, thread);
+ EXPECT_NE(THREAD_NULL, thread);
EXPECT_EQ(ChildTask(), task);
} else {
- EXPECT_EQ(kMachPortNull, thread);
- EXPECT_EQ(kMachPortNull, task);
+ EXPECT_EQ(THREAD_NULL, thread);
+ EXPECT_EQ(TASK_NULL, task);
}
EXPECT_EQ(EXC_CRASH, exception);
« no previous file with comments | « util/mach/exc_server_variants.cc ('k') | util/mach/exception_ports.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698