OLD | NEW |
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H
_ | 5 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H
_ |
6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H
_ | 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H
_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
9 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "content/public/renderer/render_process_observer.h" | 13 #include "content/public/renderer/render_process_observer.h" |
13 #include "ipc/ipc_platform_file.h" | 14 #include "ipc/ipc_platform_file.h" |
14 | 15 |
15 namespace blink { | 16 namespace blink { |
16 class WebFrame; | 17 class WebFrame; |
17 } | 18 } |
18 | 19 |
19 namespace test_runner { | 20 namespace test_runner { |
20 class WebTestDelegate; | 21 class WebTestDelegate; |
21 class WebTestInterfaces; | 22 class WebTestInterfaces; |
(...skipping 26 matching lines...) Expand all Loading... |
48 } | 49 } |
49 BlinkTestRunner* main_test_runner() const { return main_test_runner_; } | 50 BlinkTestRunner* main_test_runner() const { return main_test_runner_; } |
50 const base::FilePath& webkit_source_dir() const { return webkit_source_dir_; } | 51 const base::FilePath& webkit_source_dir() const { return webkit_source_dir_; } |
51 | 52 |
52 private: | 53 private: |
53 // Message handlers. | 54 // Message handlers. |
54 void OnSetWebKitSourceDir(const base::FilePath& webkit_source_dir); | 55 void OnSetWebKitSourceDir(const base::FilePath& webkit_source_dir); |
55 | 56 |
56 BlinkTestRunner* main_test_runner_; | 57 BlinkTestRunner* main_test_runner_; |
57 test_runner::WebTestDelegate* test_delegate_; | 58 test_runner::WebTestDelegate* test_delegate_; |
58 scoped_ptr<test_runner::WebTestInterfaces> test_interfaces_; | 59 std::unique_ptr<test_runner::WebTestInterfaces> test_interfaces_; |
59 | 60 |
60 base::FilePath webkit_source_dir_; | 61 base::FilePath webkit_source_dir_; |
61 | 62 |
62 DISALLOW_COPY_AND_ASSIGN(LayoutTestRenderProcessObserver); | 63 DISALLOW_COPY_AND_ASSIGN(LayoutTestRenderProcessObserver); |
63 }; | 64 }; |
64 | 65 |
65 } // namespace content | 66 } // namespace content |
66 | 67 |
67 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVE
R_H_ | 68 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVE
R_H_ |
OLD | NEW |