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

Side by Side Diff: chrome/test/base/ui_test_utils.h

Issue 403833002: Revert of [DevTools] Move DevToolsWindow testing code to a separate class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « chrome/chrome_tests.gypi ('k') | chrome/test/base/ui_test_utils.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 CHROME_TEST_BASE_UI_TEST_UTILS_H_ 5 #ifndef CHROME_TEST_BASE_UI_TEST_UTILS_H_
6 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_ 6 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <set> 10 #include <set>
(...skipping 10 matching lines...) Expand all
21 #include "content/public/browser/notification_source.h" 21 #include "content/public/browser/notification_source.h"
22 #include "content/public/test/test_utils.h" 22 #include "content/public/test/test_utils.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 #include "ui/base/window_open_disposition.h" 24 #include "ui/base/window_open_disposition.h"
25 #include "ui/events/keycodes/keyboard_codes.h" 25 #include "ui/events/keycodes/keyboard_codes.h"
26 #include "ui/gfx/native_widget_types.h" 26 #include "ui/gfx/native_widget_types.h"
27 #include "url/gurl.h" 27 #include "url/gurl.h"
28 28
29 class AppModalDialog; 29 class AppModalDialog;
30 class Browser; 30 class Browser;
31 class DevToolsWindow;
31 class LocationBar; 32 class LocationBar;
32 class Profile; 33 class Profile;
33 class SkBitmap; 34 class SkBitmap;
34 class TemplateURLService; 35 class TemplateURLService;
35 36
36 namespace base { 37 namespace base {
37 class FilePath; 38 class FilePath;
38 } 39 }
39 40
40 namespace chrome { 41 namespace chrome {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 const GURL& url, 104 const GURL& url,
104 WindowOpenDisposition disposition, 105 WindowOpenDisposition disposition,
105 int browser_test_flags); 106 int browser_test_flags);
106 107
107 // Navigates the selected tab of |browser| to |url|, blocking until the 108 // Navigates the selected tab of |browser| to |url|, blocking until the
108 // number of navigations specified complete. 109 // number of navigations specified complete.
109 void NavigateToURLBlockUntilNavigationsComplete(Browser* browser, 110 void NavigateToURLBlockUntilNavigationsComplete(Browser* browser,
110 const GURL& url, 111 const GURL& url,
111 int number_of_navigations); 112 int number_of_navigations);
112 113
114 // Blocks until DevTools window is loaded.
115 void WaitUntilDevToolsWindowLoaded(DevToolsWindow* window);
116
113 // Generate the file path for testing a particular test. 117 // Generate the file path for testing a particular test.
114 // The file for the tests is all located in 118 // The file for the tests is all located in
115 // test_root_directory/dir/<file> 119 // test_root_directory/dir/<file>
116 // The returned path is base::FilePath format. 120 // The returned path is base::FilePath format.
117 base::FilePath GetTestFilePath(const base::FilePath& dir, 121 base::FilePath GetTestFilePath(const base::FilePath& dir,
118 const base::FilePath& file); 122 const base::FilePath& file);
119 123
120 // Generate the URL for testing a particular test. 124 // Generate the URL for testing a particular test.
121 // HTML for the tests is all located in 125 // HTML for the tests is all located in
122 // test_root_directory/dir/<file> 126 // test_root_directory/dir/<file>
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 std::vector<GURL> urls_; 306 std::vector<GURL> urls_;
303 307
304 base::CancelableTaskTracker tracker_; 308 base::CancelableTaskTracker tracker_;
305 309
306 DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator); 310 DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator);
307 }; 311 };
308 312
309 } // namespace ui_test_utils 313 } // namespace ui_test_utils
310 314
311 #endif // CHROME_TEST_BASE_UI_TEST_UTILS_H_ 315 #endif // CHROME_TEST_BASE_UI_TEST_UTILS_H_
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698