Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Side by Side Diff: content/shell/webkit_test_runner.h

Issue 13795002: [content shell] add support for invoking testRunner.notifyDone in a different process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/webkit_test_controller.cc ('k') | content/shell/webkit_test_runner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 ::WebTestRunner::WebTestProxyBase* proxy() const { return proxy_; } 107 ::WebTestRunner::WebTestProxyBase* proxy() const { return proxy_; }
108 108
109 private: 109 private:
110 // Message handlers. 110 // Message handlers.
111 void OnSetTestConfiguration(const ShellTestConfiguration& params); 111 void OnSetTestConfiguration(const ShellTestConfiguration& params);
112 void OnSessionHistory( 112 void OnSessionHistory(
113 const std::vector<int>& routing_ids, 113 const std::vector<int>& routing_ids,
114 const std::vector<std::vector<std::string> >& session_histories, 114 const std::vector<std::vector<std::string> >& session_histories,
115 const std::vector<unsigned>& current_entry_indexes); 115 const std::vector<unsigned>& current_entry_indexes);
116 void OnReset(); 116 void OnReset();
117 void OnNotifyDone();
117 118
118 // After finishing the test, retrieves the audio, text, and pixel dumps from 119 // After finishing the test, retrieves the audio, text, and pixel dumps from
119 // the TestRunner library and sends them to the browser process. 120 // the TestRunner library and sends them to the browser process.
120 void CaptureDump(); 121 void CaptureDump();
121 122
122 ::WebTestRunner::WebTestProxyBase* proxy_; 123 ::WebTestRunner::WebTestProxyBase* proxy_;
123 124
124 RenderView* focused_view_; 125 RenderView* focused_view_;
125 126
126 ::WebTestRunner::WebPreferences prefs_; 127 ::WebTestRunner::WebPreferences prefs_;
127 128
128 ShellTestConfiguration test_config_; 129 ShellTestConfiguration test_config_;
129 130
130 std::vector<int> routing_ids_; 131 std::vector<int> routing_ids_;
131 std::vector<std::vector<std::string> > session_histories_; 132 std::vector<std::vector<std::string> > session_histories_;
132 std::vector<unsigned> current_entry_indexes_; 133 std::vector<unsigned> current_entry_indexes_;
133 134
134 bool is_main_window_; 135 bool is_main_window_;
135 136
136 bool focus_on_next_commit_; 137 bool focus_on_next_commit_;
137 138
138 scoped_ptr<webkit_glue::TestMediaStreamClient> test_media_stream_client_; 139 scoped_ptr<webkit_glue::TestMediaStreamClient> test_media_stream_client_;
139 140
140 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); 141 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
141 }; 142 };
142 143
143 } // namespace content 144 } // namespace content
144 145
145 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 146 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/shell/webkit_test_controller.cc ('k') | content/shell/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698