| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_UI_TEST_UTILS_H_ | 5 #ifndef CHROME_TEST_UI_TEST_UTILS_H_ |
| 6 #define CHROME_TEST_UI_TEST_UTILS_H_ | 6 #define CHROME_TEST_UI_TEST_UTILS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 65 |
| 66 // Waits for a new tab to be added to |browser|. | 66 // Waits for a new tab to be added to |browser|. |
| 67 void WaitForNewTab(Browser* browser); | 67 void WaitForNewTab(Browser* browser); |
| 68 | 68 |
| 69 // Waits for a |browser_action| to be updated. | 69 // Waits for a |browser_action| to be updated. |
| 70 void WaitForBrowserActionUpdated(ExtensionAction* browser_action); | 70 void WaitForBrowserActionUpdated(ExtensionAction* browser_action); |
| 71 | 71 |
| 72 // Waits for a load stop for the specified |controller|. | 72 // Waits for a load stop for the specified |controller|. |
| 73 void WaitForLoadStop(NavigationController* controller); | 73 void WaitForLoadStop(NavigationController* controller); |
| 74 | 74 |
| 75 // Waits for a new browser to be created, returning the browser. |
| 76 Browser* WaitForNewBrowser(); |
| 77 |
| 75 // Opens |url| in an incognito browser window with the off the record profile of | 78 // Opens |url| in an incognito browser window with the off the record profile of |
| 76 // |profile|, blocking until the navigation finishes. This will create a new | 79 // |profile|, blocking until the navigation finishes. This will create a new |
| 77 // browser if a browser with the off the record profile does not exist. | 80 // browser if a browser with the off the record profile does not exist. |
| 78 void OpenURLOffTheRecord(Profile* profile, const GURL& url); | 81 void OpenURLOffTheRecord(Profile* profile, const GURL& url); |
| 79 | 82 |
| 80 // Navigates the selected tab of |browser| to |url|, blocking until the | 83 // Navigates the selected tab of |browser| to |url|, blocking until the |
| 81 // navigation finishes. | 84 // navigation finishes. |
| 82 void NavigateToURL(Browser* browser, const GURL& url); | 85 void NavigateToURL(Browser* browser, const GURL& url); |
| 83 | 86 |
| 84 // Navigates the selected tab of |browser| to |url|, blocking until the | 87 // Navigates the selected tab of |browser| to |url|, blocking until the |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 std::set<uintptr_t> sources_seen_; | 329 std::set<uintptr_t> sources_seen_; |
| 327 Source<T> waiting_for_; | 330 Source<T> waiting_for_; |
| 328 NotificationRegistrar registrar_; | 331 NotificationRegistrar registrar_; |
| 329 | 332 |
| 330 DISALLOW_COPY_AND_ASSIGN(WindowedNotificationObserver); | 333 DISALLOW_COPY_AND_ASSIGN(WindowedNotificationObserver); |
| 331 }; | 334 }; |
| 332 | 335 |
| 333 } // namespace ui_test_utils | 336 } // namespace ui_test_utils |
| 334 | 337 |
| 335 #endif // CHROME_TEST_UI_TEST_UTILS_H_ | 338 #endif // CHROME_TEST_UI_TEST_UTILS_H_ |
| OLD | NEW |