OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "mojo/shell/application_loader.h" | 9 #include "mojo/shell/application_loader.h" |
10 #include "mojo/shell/application_manager.h" | 10 #include "mojo/shell/application_manager.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 DISALLOW_COPY_AND_ASSIGN(TestApplication); | 41 DISALLOW_COPY_AND_ASSIGN(TestApplication); |
42 }; | 42 }; |
43 | 43 |
44 class TestLoader : public ApplicationLoader { | 44 class TestLoader : public ApplicationLoader { |
45 public: | 45 public: |
46 explicit TestLoader(ApplicationDelegate* delegate); | 46 explicit TestLoader(ApplicationDelegate* delegate); |
47 ~TestLoader() override; | 47 ~TestLoader() override; |
48 | 48 |
49 private: | 49 private: |
50 // Overridden from ApplicationLoader: | 50 // Overridden from ApplicationLoader: |
51 void Load(const GURL& url, InterfaceRequest<Application> request) override; | 51 void Load(const GURL& url, |
| 52 InterfaceRequest<mojom::Application> request) override; |
52 | 53 |
53 scoped_ptr<ApplicationDelegate> delegate_; | 54 scoped_ptr<ApplicationDelegate> delegate_; |
54 scoped_ptr<ApplicationImpl> app_; | 55 scoped_ptr<ApplicationImpl> app_; |
55 | 56 |
56 DISALLOW_COPY_AND_ASSIGN(TestLoader); | 57 DISALLOW_COPY_AND_ASSIGN(TestLoader); |
57 }; | 58 }; |
58 | 59 |
59 class CapabilityFilterTest : public testing::Test { | 60 class CapabilityFilterTest : public testing::Test { |
60 public: | 61 public: |
61 CapabilityFilterTest(); | 62 CapabilityFilterTest(); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 base::MessageLoop loop_; | 100 base::MessageLoop loop_; |
100 scoped_ptr<ApplicationManager> application_manager_; | 101 scoped_ptr<ApplicationManager> application_manager_; |
101 ConnectionValidator* validator_; | 102 ConnectionValidator* validator_; |
102 | 103 |
103 DISALLOW_COPY_AND_ASSIGN(CapabilityFilterTest); | 104 DISALLOW_COPY_AND_ASSIGN(CapabilityFilterTest); |
104 }; | 105 }; |
105 | 106 |
106 } // namespace test | 107 } // namespace test |
107 } // namespace shell | 108 } // namespace shell |
108 } // namespace mojo | 109 } // namespace mojo |
OLD | NEW |