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

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

Issue 4724004: Group commandline settings in UI test and in process browser test. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head Created 10 years, 1 month 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 | « no previous file | chrome/test/in_process_browser_test.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) 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 virtual bool CreateUserDataDirectory() WARN_UNUSED_RESULT; 142 virtual bool CreateUserDataDirectory() WARN_UNUSED_RESULT;
143 143
144 // This is invoked from main after browser_init/browser_main have completed. 144 // This is invoked from main after browser_init/browser_main have completed.
145 // This prepares for the test by creating a new browser, runs the test 145 // This prepares for the test by creating a new browser, runs the test
146 // (RunTestOnMainThread), quits the browsers and returns. 146 // (RunTestOnMainThread), quits the browsers and returns.
147 void RunTestOnMainThreadLoop(); 147 void RunTestOnMainThreadLoop();
148 148
149 // Quits all open browsers and waits until there are no more browsers. 149 // Quits all open browsers and waits until there are no more browsers.
150 void QuitBrowsers(); 150 void QuitBrowsers();
151 151
152 // Prepare command line that will be used to launch the child browser process
153 // with an in-process test.
154 void PrepareTestCommandLine(CommandLine* command_line);
155
152 // Browser created from CreateBrowser. 156 // Browser created from CreateBrowser.
153 Browser* browser_; 157 Browser* browser_;
154 158
155 // Testing server, started on demand. 159 // Testing server, started on demand.
156 scoped_ptr<net::TestServer> test_server_; 160 scoped_ptr<net::TestServer> test_server_;
157 161
158 // Whether this test requires the browser windows to be shown (interactive 162 // Whether this test requires the browser windows to be shown (interactive
159 // tests for example need the windows shown). 163 // tests for example need the windows shown).
160 bool show_window_; 164 bool show_window_;
161 165
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\ 218 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
215 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread() 219 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
216 220
217 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\ 221 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
218 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\ 222 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
219 ::testing::internal::GetTypeId<test_fixture>()) 223 ::testing::internal::GetTypeId<test_fixture>())
220 224
221 #endif // defined(ALLOW_IN_PROC_BROWSER_TEST) 225 #endif // defined(ALLOW_IN_PROC_BROWSER_TEST)
222 226
223 #endif // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_ 227 #endif // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698