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

Unified Diff: third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc

Issue 1311043003: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/public/cpp/bindings/tests/router_unittest.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
index def9cebfb69adf035167e259531874047aa2794f..7aeb414f3903e51f9b716167c2b27dabaa5dc239 100644
--- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
@@ -6,8 +6,8 @@
#include <string.h>
#include "mojo/public/cpp/bindings/lib/message_builder.h"
-#include "mojo/public/cpp/bindings/lib/message_queue.h"
#include "mojo/public/cpp/bindings/lib/router.h"
+#include "mojo/public/cpp/bindings/tests/message_queue.h"
#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/cpp/utility/run_loop.h"
@@ -36,7 +36,7 @@ void AllocResponseMessage(uint32_t name,
class MessageAccumulator : public MessageReceiver {
public:
- explicit MessageAccumulator(internal::MessageQueue* queue) : queue_(queue) {}
+ explicit MessageAccumulator(MessageQueue* queue) : queue_(queue) {}
bool Accept(Message* message) override {
queue_->Push(message);
@@ -44,7 +44,7 @@ class MessageAccumulator : public MessageReceiver {
}
private:
- internal::MessageQueue* queue_;
+ MessageQueue* queue_;
};
class ResponseGenerator : public MessageReceiverWithResponderStatus {
@@ -152,7 +152,7 @@ TEST_F(RouterTest, BasicRequestResponse) {
Message request;
AllocRequestMessage(1, "hello", &request);
- internal::MessageQueue message_queue;
+ MessageQueue message_queue;
router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
PumpMessages();
@@ -192,7 +192,7 @@ TEST_F(RouterTest, BasicRequestResponse_Synchronous) {
Message request;
AllocRequestMessage(1, "hello", &request);
- internal::MessageQueue message_queue;
+ MessageQueue message_queue;
router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
router1.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
@@ -234,7 +234,7 @@ TEST_F(RouterTest, RequestWithNoReceiver) {
Message request;
AllocRequestMessage(1, "hello", &request);
- internal::MessageQueue message_queue;
+ MessageQueue message_queue;
router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
PumpMessages();
@@ -256,7 +256,7 @@ TEST_F(RouterTest, LazyResponses) {
Message request;
AllocRequestMessage(1, "hello", &request);
- internal::MessageQueue message_queue;
+ MessageQueue message_queue;
router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
PumpMessages();
@@ -311,7 +311,7 @@ TEST_F(RouterTest, MissingResponses) {
Message request;
AllocRequestMessage(1, "hello", &request);
- internal::MessageQueue message_queue;
+ MessageQueue message_queue;
router0.AcceptWithResponder(&request, new MessageAccumulator(&message_queue));
PumpMessages();
@@ -354,7 +354,7 @@ TEST_F(RouterTest, LateResponse) {
Message request;
AllocRequestMessage(1, "hello", &request);
- internal::MessageQueue message_queue;
+ MessageQueue message_queue;
router0.AcceptWithResponder(&request,
new MessageAccumulator(&message_queue));

Powered by Google App Engine
This is Rietveld 408576698