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

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

Issue 10827356: Revert 151716 - Add NaCl smoke test to browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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')
Property Changes:
Added: svn:mergeinfo
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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // test_root_directory/dir/<file> 123 // test_root_directory/dir/<file>
124 // The returned path is FilePath format. 124 // The returned path is FilePath format.
125 FilePath GetTestFilePath(const FilePath& dir, const FilePath& file); 125 FilePath GetTestFilePath(const FilePath& dir, const FilePath& file);
126 126
127 // Generate the URL for testing a particular test. 127 // Generate the URL for testing a particular test.
128 // HTML for the tests is all located in 128 // HTML for the tests is all located in
129 // test_root_directory/dir/<file> 129 // test_root_directory/dir/<file>
130 // The returned path is GURL format. 130 // The returned path is GURL format.
131 GURL GetTestUrl(const FilePath& dir, const FilePath& file); 131 GURL GetTestUrl(const FilePath& dir, const FilePath& file);
132 132
133 // Generate the path of the build directory, relative to the source root.
134 bool GetRelativeBuildDirectory(FilePath *build_dir);
135
136 // Blocks until an application modal dialog is showns and returns it. 133 // Blocks until an application modal dialog is showns and returns it.
137 AppModalDialog* WaitForAppModalDialog(); 134 AppModalDialog* WaitForAppModalDialog();
138 135
139 // Performs a find in the page of the specified tab. Returns the number of 136 // Performs a find in the page of the specified tab. Returns the number of
140 // matches found. |ordinal| is an optional parameter which is set to the index 137 // matches found. |ordinal| is an optional parameter which is set to the index
141 // of the current match. 138 // of the current match.
142 int FindInPage(TabContents* tab, 139 int FindInPage(TabContents* tab,
143 const string16& search_string, 140 const string16& search_string,
144 bool forward, 141 bool forward,
145 bool case_sensitive, 142 bool case_sensitive,
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 // ui_controls_linux.cc and ui_controls_mac.cc 429 // ui_controls_linux.cc and ui_controls_mac.cc
433 void ClickTask(ui_controls::MouseButton button, 430 void ClickTask(ui_controls::MouseButton button,
434 int state, 431 int state,
435 const base::Closure& followup); 432 const base::Closure& followup);
436 433
437 } // namespace internal 434 } // namespace internal
438 435
439 } // namespace ui_test_utils 436 } // namespace ui_test_utils
440 437
441 #endif // CHROME_TEST_BASE_UI_TEST_UTILS_H_ 438 #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