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 SHELL_SHELL_TEST_BASE_H_ | 5 #ifndef SHELL_SHELL_TEST_BASE_H_ |
6 #define SHELL_SHELL_TEST_BASE_H_ | 6 #define 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 18 matching lines...) Expand all Loading... |
29 // |application_url| should typically be a mojo: URL (the origin will be set | 29 // |application_url| should typically be a mojo: URL (the origin will be set |
30 // to an "appropriate" file: URL). | 30 // to an "appropriate" file: URL). |
31 // TODO(tim): Should the test base be a mojo::ServiceProvider? | 31 // TODO(tim): Should the test base be a mojo::ServiceProvider? |
32 mojo::ScopedMessagePipeHandle ConnectToService( | 32 mojo::ScopedMessagePipeHandle ConnectToService( |
33 const GURL& application_url, | 33 const GURL& application_url, |
34 const std::string& service_name); | 34 const std::string& service_name); |
35 | 35 |
36 template <typename Interface> | 36 template <typename Interface> |
37 void ConnectToService(const GURL& application_url, | 37 void ConnectToService(const GURL& application_url, |
38 mojo::InterfacePtr<Interface>* ptr) { | 38 mojo::InterfacePtr<Interface>* ptr) { |
39 ptr->Bind(ConnectToService(application_url, Interface::Name_).Pass()); | 39 mojo::InterfacePtrInfo<Interface> interface( |
| 40 ConnectToService(application_url, Interface::Name_).Pass(), 0u); |
| 41 ptr->Bind(interface.Pass()); |
40 } | 42 } |
41 | 43 |
42 base::MessageLoop* message_loop() { return &message_loop_; } | 44 base::MessageLoop* message_loop() { return &message_loop_; } |
43 Context* shell_context() { return &shell_context_; } | 45 Context* shell_context() { return &shell_context_; } |
44 | 46 |
45 private: | 47 private: |
46 // Set up the test applications so that mojo: URL resolves to those. | 48 // Set up the test applications so that mojo: URL resolves to those. |
47 void SetUpTestApplications(); | 49 void SetUpTestApplications(); |
48 | 50 |
49 Context shell_context_; | 51 Context shell_context_; |
50 base::MessageLoop message_loop_; | 52 base::MessageLoop message_loop_; |
51 | 53 |
52 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); | 54 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); |
53 }; | 55 }; |
54 | 56 |
55 } // namespace test | 57 } // namespace test |
56 } // namespace shell | 58 } // namespace shell |
57 | 59 |
58 #endif // SHELL_SHELL_TEST_BASE_H_ | 60 #endif // SHELL_SHELL_TEST_BASE_H_ |
OLD | NEW |