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

Side by Side Diff: chrome/test/in_process_browser_test.h

Issue 5610006: Converted download UI tests to Browser tests. (Closed) Base URL: http://git.chromium.org/git/chromium.git@browser_tests
Patch Set: Removed WaitForWindowClosed(). Created 9 years, 11 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) 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_IN_PROCESS_BROWSER_TEST_H_ 5 #ifndef CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
6 #define CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_ 6 #define CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 // Returns the testing server. Guaranteed to be non-NULL. 139 // Returns the testing server. Guaranteed to be non-NULL.
140 net::TestServer* test_server() { return test_server_.get(); } 140 net::TestServer* test_server() { return test_server_.get(); }
141 141
142 // Creates a browser with a single tab (about:blank), waits for the tab to 142 // Creates a browser with a single tab (about:blank), waits for the tab to
143 // finish loading and shows the browser. 143 // finish loading and shows the browser.
144 // 144 //
145 // This is invoked from Setup. 145 // This is invoked from Setup.
146 virtual Browser* CreateBrowser(Profile* profile); 146 virtual Browser* CreateBrowser(Profile* profile);
147 147
148 // Similar to |CreateBrowser|, but creates an incognito browser.
149 virtual Browser* CreateIncognitoBrowser();
150
148 // Creates a browser for a popup window with a single tab (about:blank), waits 151 // Creates a browser for a popup window with a single tab (about:blank), waits
149 // for the tab to finish loading, and shows the browser. 152 // for the tab to finish loading, and shows the browser.
150 Browser* CreateBrowserForPopup(Profile* profile); 153 Browser* CreateBrowserForPopup(Profile* profile);
151 154
152 // Returns the host resolver being used for the tests. Subclasses might want 155 // Returns the host resolver being used for the tests. Subclasses might want
153 // to configure it inside tests. 156 // to configure it inside tests.
154 net::RuleBasedHostResolverProc* host_resolver() { 157 net::RuleBasedHostResolverProc* host_resolver() {
155 return host_resolver_.get(); 158 return host_resolver_.get();
156 } 159 }
157 160
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\ 252 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
250 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread() 253 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
251 254
252 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\ 255 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
253 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\ 256 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
254 ::testing::internal::GetTypeId<test_fixture>()) 257 ::testing::internal::GetTypeId<test_fixture>())
255 258
256 #endif // defined(ALLOW_IN_PROC_BROWSER_TEST) 259 #endif // defined(ALLOW_IN_PROC_BROWSER_TEST)
257 260
258 #endif // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_ 261 #endif // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698