| 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 #ifndef MOJO_SHELL_SHELL_TEST_HELPER_ | 5 #ifndef MOJO_SHELL_SHELL_TEST_HELPER_ |
| 6 #define MOJO_SHELL_SHELL_TEST_HELPER_ | 6 #define MOJO_SHELL_SHELL_TEST_HELPER_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
| 12 #include "mojo/public/cpp/bindings/remote_ptr.h" | |
| 13 #include "mojo/public/cpp/environment/environment.h" | 12 #include "mojo/public/cpp/environment/environment.h" |
| 14 #include "mojo/public/interfaces/shell/shell.mojom.h" | 13 #include "mojo/public/interfaces/shell/shell.mojom.h" |
| 15 | 14 |
| 16 namespace base { | 15 namespace base { |
| 17 class MessageLoopProxy; | 16 class MessageLoopProxy; |
| 18 class RunLoop; | 17 class RunLoop; |
| 19 } | 18 } |
| 20 | 19 |
| 21 namespace mojo { | 20 namespace mojo { |
| 22 namespace shell { | 21 namespace shell { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 48 | 47 |
| 49 // If non-null we're in Init() and waiting for connection. | 48 // If non-null we're in Init() and waiting for connection. |
| 50 scoped_ptr<base::RunLoop> run_loop_; | 49 scoped_ptr<base::RunLoop> run_loop_; |
| 51 | 50 |
| 52 // See comment in declaration for details. | 51 // See comment in declaration for details. |
| 53 State* state_; | 52 State* state_; |
| 54 | 53 |
| 55 // Client interface for the shell. | 54 // Client interface for the shell. |
| 56 scoped_ptr<TestShellClient> shell_client_; | 55 scoped_ptr<TestShellClient> shell_client_; |
| 57 | 56 |
| 58 RemotePtr<Shell> shell_; | 57 ShellPtr shell_; |
| 59 | 58 |
| 60 DISALLOW_COPY_AND_ASSIGN(ShellTestHelper); | 59 DISALLOW_COPY_AND_ASSIGN(ShellTestHelper); |
| 61 }; | 60 }; |
| 62 | 61 |
| 63 } // namespace shell | 62 } // namespace shell |
| 64 } // namespace mojo | 63 } // namespace mojo |
| 65 | 64 |
| 66 #endif // MOJO_SHELL_SHELL_TEST_HELPER_ | 65 #endif // MOJO_SHELL_SHELL_TEST_HELPER_ |
| OLD | NEW |