| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WEBKIT_TEST_RUNNER_H_ | 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ | 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/threading/thread.h" |
| 12 #include "content/public/renderer/render_view_observer.h" | 13 #include "content/public/renderer/render_view_observer.h" |
| 13 #include "content/public/renderer/render_view_observer_tracker.h" | 14 #include "content/public/renderer/render_view_observer_tracker.h" |
| 14 #include "content/shell/common/shell_test_configuration.h" | 15 #include "content/shell/common/shell_test_configuration.h" |
| 15 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
Preferences.h" | 16 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
Preferences.h" |
| 16 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestDelegate.h" | 17 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestDelegate.h" |
| 17 #include "v8/include/v8.h" | 18 #include "v8/include/v8.h" |
| 18 | 19 |
| 19 class SkCanvas; | 20 class SkCanvas; |
| 20 | 21 |
| 21 namespace WebKit { | 22 namespace WebKit { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 | 131 |
| 131 std::vector<int> routing_ids_; | 132 std::vector<int> routing_ids_; |
| 132 std::vector<std::vector<std::string> > session_histories_; | 133 std::vector<std::vector<std::string> > session_histories_; |
| 133 std::vector<unsigned> current_entry_indexes_; | 134 std::vector<unsigned> current_entry_indexes_; |
| 134 | 135 |
| 135 bool is_main_window_; | 136 bool is_main_window_; |
| 136 | 137 |
| 137 bool focus_on_next_commit_; | 138 bool focus_on_next_commit_; |
| 138 | 139 |
| 139 scoped_ptr<webkit_glue::TestMediaStreamClient> test_media_stream_client_; | 140 scoped_ptr<webkit_glue::TestMediaStreamClient> test_media_stream_client_; |
| 141 base::Thread media_thread_; |
| 140 | 142 |
| 141 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); | 143 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); |
| 142 }; | 144 }; |
| 143 | 145 |
| 144 } // namespace content | 146 } // namespace content |
| 145 | 147 |
| 146 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ | 148 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| OLD | NEW |