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 SKY_TOOLS_TESTER_TEST_RUNNER_H_ | 5 #ifndef SKY_TOOLS_TESTER_TEST_RUNNER_H_ |
6 #define SKY_TOOLS_TESTER_TEST_RUNNER_H_ | 6 #define SKY_TOOLS_TESTER_TEST_RUNNER_H_ |
7 | 7 |
8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "mojo/public/cpp/application/service_provider_impl.h" |
9 #include "sky/tools/tester/test_harness_impl.h" | 10 #include "sky/tools/tester/test_harness_impl.h" |
10 | 11 |
11 namespace mojo{ | 12 namespace mojo{ |
12 class View; | 13 class View; |
13 } | 14 } |
14 | 15 |
15 namespace sky { | 16 namespace sky { |
16 namespace tester { | 17 namespace tester { |
17 | 18 |
18 class TestRunnerClient { | 19 class TestRunnerClient { |
(...skipping 14 matching lines...) Expand all Loading... |
33 TestRunnerClient* client() const { return client_; } | 34 TestRunnerClient* client() const { return client_; } |
34 TestHarnessFactory* test_harness_factory() { return &test_harness_factory_; } | 35 TestHarnessFactory* test_harness_factory() { return &test_harness_factory_; } |
35 | 36 |
36 base::WeakPtr<TestRunner> GetWeakPtr(); | 37 base::WeakPtr<TestRunner> GetWeakPtr(); |
37 void OnTestStart(); | 38 void OnTestStart(); |
38 void OnTestComplete(const std::string& test_result, | 39 void OnTestComplete(const std::string& test_result, |
39 const mojo::Array<uint8_t>& pixels); | 40 const mojo::Array<uint8_t>& pixels); |
40 | 41 |
41 private: | 42 private: |
42 TestHarnessFactory test_harness_factory_; | 43 TestHarnessFactory test_harness_factory_; |
| 44 mojo::ServiceProviderImpl test_harness_provider_impl_; |
43 TestRunnerClient* client_; | 45 TestRunnerClient* client_; |
44 base::WeakPtrFactory<TestRunner> weak_ptr_factory_; | 46 base::WeakPtrFactory<TestRunner> weak_ptr_factory_; |
45 bool enable_pixel_dumping_; | 47 bool enable_pixel_dumping_; |
46 | 48 |
47 MOJO_DISALLOW_COPY_AND_ASSIGN(TestRunner); | 49 MOJO_DISALLOW_COPY_AND_ASSIGN(TestRunner); |
48 }; | 50 }; |
49 | 51 |
50 } // namespace tester | 52 } // namespace tester |
51 } // namespace sky | 53 } // namespace sky |
52 | 54 |
53 #endif // SKY_TOOLS_TESTER_TEST_RUNNER_H_ | 55 #endif // SKY_TOOLS_TESTER_TEST_RUNNER_H_ |
OLD | NEW |