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

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

Issue 10546139: Do the ReloadLocaleResources() call on the IO thread to avoid synchronization issues. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove ui_test_utils:: for call within same namespace. Created 8 years, 6 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
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <queue> 10 #include <queue>
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 class GURL; 48 class GURL;
49 class HistoryService; 49 class HistoryService;
50 class MessageLoop; 50 class MessageLoop;
51 class Profile; 51 class Profile;
52 class ScopedTempDir; 52 class ScopedTempDir;
53 class SkBitmap; 53 class SkBitmap;
54 class TabContents; 54 class TabContents;
55 typedef TabContents TabContentsWrapper; 55 typedef TabContents TabContentsWrapper;
56 class TemplateURLService; 56 class TemplateURLService;
57 57
58 namespace base {
59 class WaitableEvent;
60 }
61
58 namespace browser { 62 namespace browser {
59 struct NavigateParams; 63 struct NavigateParams;
60 } 64 }
61 65
62 namespace content { 66 namespace content {
63 class RenderViewHost; 67 class RenderViewHost;
64 class RenderWidgetHost; 68 class RenderWidgetHost;
65 class WebContents; 69 class WebContents;
66 } 70 }
67 71
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 124
121 // Waits for a load stop for the specified |tab|'s controller, if the tab is 125 // Waits for a load stop for the specified |tab|'s controller, if the tab is
122 // currently loading. Otherwise returns immediately. 126 // currently loading. Otherwise returns immediately.
123 void WaitForLoadStop(content::WebContents* tab); 127 void WaitForLoadStop(content::WebContents* tab);
124 128
125 // Waits for a new browser to be created, returning the browser. 129 // Waits for a new browser to be created, returning the browser.
126 // TODO(dubroy): Remove this race hazard (http://crbug.com/119521). 130 // TODO(dubroy): Remove this race hazard (http://crbug.com/119521).
127 // Use BrowserAddedObserver instead. 131 // Use BrowserAddedObserver instead.
128 Browser* WaitForNewBrowser(); 132 Browser* WaitForNewBrowser();
129 133
134 // Waits for |event| to be signaled running message loop in the current thread
135 // while waiting.
136 void WaitEventSignaled(base::WaitableEvent* event);
137
130 // Opens |url| in an incognito browser window with the incognito profile of 138 // Opens |url| in an incognito browser window with the incognito profile of
131 // |profile|, blocking until the navigation finishes. This will create a new 139 // |profile|, blocking until the navigation finishes. This will create a new
132 // browser if a browser with the incognito profile does not exist. 140 // browser if a browser with the incognito profile does not exist.
133 void OpenURLOffTheRecord(Profile* profile, const GURL& url); 141 void OpenURLOffTheRecord(Profile* profile, const GURL& url);
134 142
135 // Performs the provided navigation process, blocking until the navigation 143 // Performs the provided navigation process, blocking until the navigation
136 // finishes. May change the params in some cases (i.e. if the navigation 144 // finishes. May change the params in some cases (i.e. if the navigation
137 // opens a new browser window). Uses browser::Navigate. 145 // opens a new browser window). Uses browser::Navigate.
138 void NavigateToURL(browser::NavigateParams* params); 146 void NavigateToURL(browser::NavigateParams* params);
139 147
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 // ui_controls_linux.cc and ui_controls_mac.cc 702 // ui_controls_linux.cc and ui_controls_mac.cc
695 void ClickTask(ui_controls::MouseButton button, 703 void ClickTask(ui_controls::MouseButton button,
696 int state, 704 int state,
697 const base::Closure& followup); 705 const base::Closure& followup);
698 706
699 } // namespace internal 707 } // namespace internal
700 708
701 } // namespace ui_test_utils 709 } // namespace ui_test_utils
702 710
703 #endif // CHROME_TEST_BASE_UI_TEST_UTILS_H_ 711 #endif // CHROME_TEST_BASE_UI_TEST_UTILS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698