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

Side by Side Diff: content/shell/browser/webkit_test_controller.h

Issue 162903002: Remove WebKitTestController::TimeoutHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « no previous file | content/shell/browser/webkit_test_controller.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 5 #ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
6 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 6 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
7 7
8 #include <ostream> 8 #include <ostream>
9 #include <string> 9 #include <string>
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 private: 148 private:
149 enum TestPhase { 149 enum TestPhase {
150 BETWEEN_TESTS, 150 BETWEEN_TESTS,
151 DURING_TEST, 151 DURING_TEST,
152 CLEAN_UP 152 CLEAN_UP
153 }; 153 };
154 154
155 static WebKitTestController* instance_; 155 static WebKitTestController* instance_;
156 156
157 void TimeoutHandler();
158 void DiscardMainWindow(); 157 void DiscardMainWindow();
159 void SendTestConfiguration(); 158 void SendTestConfiguration();
160 159
161 // Message handlers. 160 // Message handlers.
162 void OnAudioDump(const std::vector<unsigned char>& audio_dump); 161 void OnAudioDump(const std::vector<unsigned char>& audio_dump);
163 void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image); 162 void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
164 void OnTextDump(const std::string& dump); 163 void OnTextDump(const std::string& dump);
165 void OnPrintMessage(const std::string& message); 164 void OnPrintMessage(const std::string& message);
166 void OnOverridePreferences(const WebPreferences& prefs); 165 void OnOverridePreferences(const WebPreferences& prefs);
167 void OnTestFinished(); 166 void OnTestFinished();
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // waiting on the UI thread while layout tests are being ran. 213 // waiting on the UI thread while layout tests are being ran.
215 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; 214 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
216 #endif 215 #endif
217 216
218 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); 217 DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
219 }; 218 };
220 219
221 } // namespace content 220 } // namespace content
222 221
223 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 222 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/browser/webkit_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698