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

Unified Diff: third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep permission service alive if embedder drops requests Created 5 years, 9 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
Index: third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc
diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc
index a95ce3022d02c66ac8562947ae877e4215216102..87b9560b8f9c376c5f759eaf992371298e2f9832 100644
--- a/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc
@@ -44,9 +44,10 @@ scoped_ptr<MessageInTransit> MakeTestMessage(uint32_t num_bytes) {
std::vector<unsigned char> bytes(num_bytes, 0);
for (size_t i = 0; i < num_bytes; i++)
bytes[i] = static_cast<unsigned char>(i + num_bytes);
- return make_scoped_ptr(new MessageInTransit(
- MessageInTransit::kTypeEndpoint, MessageInTransit::kSubtypeEndpointData,
- num_bytes, bytes.empty() ? nullptr : &bytes[0]));
+ return make_scoped_ptr(
+ new MessageInTransit(MessageInTransit::kTypeEndpointClient,
+ MessageInTransit::kSubtypeEndpointClientData,
+ num_bytes, bytes.empty() ? nullptr : &bytes[0]));
}
bool CheckMessageData(const void* bytes, uint32_t num_bytes) {
@@ -837,8 +838,8 @@ TEST_F(RawChannelTest, MAYBE_ReadWritePlatformHandles) {
mojo::test::PlatformHandleFromFILE(fp2.Pass()).release());
scoped_ptr<MessageInTransit> message(new MessageInTransit(
- MessageInTransit::kTypeEndpoint, MessageInTransit::kSubtypeEndpointData,
- sizeof(kHello), kHello));
+ MessageInTransit::kTypeEndpointClient,
+ MessageInTransit::kSubtypeEndpointClientData, sizeof(kHello), kHello));
message->SetTransportData(
make_scoped_ptr(new TransportData(platform_handles.Pass())));
EXPECT_TRUE(rc_write->WriteMessage(message.Pass()));

Powered by Google App Engine
This is Rietveld 408576698