| 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_BASE_H_ | 5 #ifndef MOJO_SHELL_SHELL_TEST_BASE_H_ |
| 6 #define MOJO_SHELL_SHELL_TEST_BASE_H_ | 6 #define MOJO_SHELL_SHELL_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 ScopedMessagePipeHandle ConnectToServiceViaNetwork( | 42 ScopedMessagePipeHandle ConnectToServiceViaNetwork( |
| 43 const GURL& application_url, | 43 const GURL& application_url, |
| 44 const std::string& service_name); | 44 const std::string& service_name); |
| 45 | 45 |
| 46 base::MessageLoop* message_loop() { return &message_loop_; } | 46 base::MessageLoop* message_loop() { return &message_loop_; } |
| 47 Context* shell_context() { return &shell_context_; } | 47 Context* shell_context() { return &shell_context_; } |
| 48 | 48 |
| 49 private: | 49 private: |
| 50 scoped_ptr<net::test_server::EmbeddedTestServer> test_server_; | 50 scoped_ptr<net::test_server::EmbeddedTestServer> test_server_; |
| 51 Context shell_context_; |
| 51 base::MessageLoop message_loop_; | 52 base::MessageLoop message_loop_; |
| 52 Context shell_context_; | |
| 53 | 53 |
| 54 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); | 54 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 } // namespace test | 57 } // namespace test |
| 58 } // namespace shell | 58 } // namespace shell |
| 59 } // namespace mojo | 59 } // namespace mojo |
| 60 | 60 |
| 61 #endif // MOJO_SHELL_SHELL_TEST_BASE_H_ | 61 #endif // MOJO_SHELL_SHELL_TEST_BASE_H_ |
| OLD | NEW |