| OLD | NEW |
| 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 <utility> | 5 #include <utility> |
| 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" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "mojo/public/cpp/bindings/binding.h" | 12 #include "mojo/public/cpp/bindings/binding.h" |
| 13 #include "mojo/public/cpp/system/message_pipe.h" | 13 #include "mojo/public/cpp/system/message_pipe.h" |
| 14 #include "mojo/shell/public/cpp/application_test_base.h" | 14 #include "services/shell/public/cpp/application_test_base.h" |
| 15 #include "mojo/shell/public/cpp/shell_connection.h" | 15 #include "services/shell/public/cpp/shell_connection.h" |
| 16 #include "mojo/shell/public/interfaces/shell_client.mojom.h" | 16 #include "services/shell/public/interfaces/shell_client.mojom.h" |
| 17 | 17 |
| 18 namespace mojo { | 18 namespace mojo { |
| 19 namespace test { | 19 namespace test { |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 // Share the application name with multiple application tests. | 23 // Share the application name with multiple application tests. |
| 24 shell::mojom::IdentityPtr g_identity; | 24 shell::mojom::IdentityPtr g_identity; |
| 25 uint32_t g_id = shell::mojom::kInvalidInstanceID; | 25 uint32_t g_id = shell::mojom::kInvalidInstanceID; |
| 26 | 26 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 CHECK(!base::MessageLoop::current()); | 174 CHECK(!base::MessageLoop::current()); |
| 175 } | 175 } |
| 176 } | 176 } |
| 177 | 177 |
| 178 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() { | 178 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() { |
| 179 return true; | 179 return true; |
| 180 } | 180 } |
| 181 | 181 |
| 182 } // namespace test | 182 } // namespace test |
| 183 } // namespace mojo | 183 } // namespace mojo |
| OLD | NEW |