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

Side by Side Diff: mojo/edk/embedder/embedder_unittest.cc

Issue 1374263004: Fix other build errors from r352208. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | mojo/edk/system/data_pipe_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/edk/embedder/embedder.h" 5 #include "mojo/edk/embedder/embedder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 char read_buffer[20000] = {}; 126 char read_buffer[20000] = {};
127 uint32_t num_bytes = static_cast<uint32_t>(sizeof(read_buffer)); 127 uint32_t num_bytes = static_cast<uint32_t>(sizeof(read_buffer));
128 MojoHandle ports[10]; 128 MojoHandle ports[10];
129 uint32_t num_ports; 129 uint32_t num_ports;
130 EXPECT_EQ(MOJO_RESULT_OK, 130 EXPECT_EQ(MOJO_RESULT_OK,
131 MojoReadMessage(client_mp, read_buffer, &num_bytes, &ports[0], 131 MojoReadMessage(client_mp, read_buffer, &num_bytes, &ports[0],
132 &num_ports, MOJO_READ_MESSAGE_FLAG_NONE)); 132 &num_ports, MOJO_READ_MESSAGE_FLAG_NONE));
133 EXPECT_EQ(write_size, num_bytes); 133 EXPECT_EQ(write_size, num_bytes);
134 EXPECT_STREQ(kHello, read_buffer); 134 EXPECT_STREQ(kHello, read_buffer);
135 EXPECT_EQ(1, num_ports); 135 EXPECT_EQ(1u, num_ports);
136 136
137 137
138 client_mp2 = ports[0]; 138 client_mp2 = ports[0];
139 EXPECT_EQ(MOJO_RESULT_OK, MojoWait(client_mp2, MOJO_HANDLE_SIGNAL_READABLE, 139 EXPECT_EQ(MOJO_RESULT_OK, MojoWait(client_mp2, MOJO_HANDLE_SIGNAL_READABLE,
140 MOJO_DEADLINE_INDEFINITE, &state)); 140 MOJO_DEADLINE_INDEFINITE, &state));
141 EXPECT_EQ(kSignalReadadableWritable, state.satisfied_signals); 141 EXPECT_EQ(kSignalReadadableWritable, state.satisfied_signals);
142 EXPECT_EQ(kSignalAll, state.satisfiable_signals); 142 EXPECT_EQ(kSignalAll, state.satisfiable_signals);
143 143
144 144
145 EXPECT_EQ(MOJO_RESULT_OK, 145 EXPECT_EQ(MOJO_RESULT_OK,
146 MojoReadMessage(client_mp2, read_buffer, &num_bytes, &client_mp3, 146 MojoReadMessage(client_mp2, read_buffer, &num_bytes, &client_mp3,
147 &num_ports, MOJO_READ_MESSAGE_FLAG_NONE)); 147 &num_ports, MOJO_READ_MESSAGE_FLAG_NONE));
148 EXPECT_EQ(write_size, num_bytes); 148 EXPECT_EQ(write_size, num_bytes);
149 EXPECT_STREQ(kHello, read_buffer); 149 EXPECT_STREQ(kHello, read_buffer);
150 EXPECT_EQ(1, num_ports); 150 EXPECT_EQ(1u, num_ports);
151 151
152 152
153 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp3)); 153 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp3));
154 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp3)); 154 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp3));
155 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp2)); 155 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp2));
156 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp2)); 156 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp2));
157 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp)); 157 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(server_mp));
158 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp)); 158 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(client_mp));
159 } 159 }
160 160
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(mp1)); 551 EXPECT_EQ(MOJO_RESULT_OK, MojoClose(mp1));
552 } 552 }
553 } 553 }
554 554
555 // TODO(vtl): Test immediate write & close. 555 // TODO(vtl): Test immediate write & close.
556 // TODO(vtl): Test broken-connection cases. 556 // TODO(vtl): Test broken-connection cases.
557 557
558 } // namespace 558 } // namespace
559 } // namespace edk 559 } // namespace edk
560 } // namespace mojo 560 } // namespace mojo
OLDNEW
« no previous file with comments | « no previous file | mojo/edk/system/data_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698