OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/common/message_pump_mojo.h" | 5 #include "mojo/message_pump/message_pump_mojo.h" |
6 | 6 |
7 #include "base/message_loop/message_loop_test.h" | 7 #include "base/message_loop/message_loop_test.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "mojo/common/message_pump_mojo_handler.h" | 9 #include "mojo/message_pump/message_pump_mojo_handler.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
11 #include "third_party/mojo/src/mojo/public/cpp/system/core.h" | 11 #include "third_party/mojo/src/mojo/public/cpp/system/core.h" |
12 | 12 |
13 namespace mojo { | 13 namespace mojo { |
14 namespace common { | 14 namespace common { |
15 namespace test { | 15 namespace test { |
16 | 16 |
17 scoped_ptr<base::MessagePump> CreateMojoMessagePump() { | 17 scoped_ptr<base::MessagePump> CreateMojoMessagePump() { |
18 return scoped_ptr<base::MessagePump>(new MessagePumpMojo()); | 18 return scoped_ptr<base::MessagePump>(new MessagePumpMojo()); |
19 } | 19 } |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 for (int i = 0; i < 2; ++i) { | 115 for (int i = 0; i < 2; ++i) { |
116 base::RunLoop run_loop; | 116 base::RunLoop run_loop; |
117 run_loop.RunUntilIdle(); | 117 run_loop.RunUntilIdle(); |
118 } | 118 } |
119 EXPECT_EQ(1, handler.error_count()); | 119 EXPECT_EQ(1, handler.error_count()); |
120 } | 120 } |
121 | 121 |
122 } // namespace test | 122 } // namespace test |
123 } // namespace common | 123 } // namespace common |
124 } // namespace mojo | 124 } // namespace mojo |
OLD | NEW |