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

Unified Diff: chrome/test/ui/ui_test.cc

Issue 10825109: Add default testing command line flags in UITestBase instead of ProxyLauncher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix define 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/proxy_launcher.cc ('k') | chrome/test/webdriver/webdriver_automation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 9ee6ead42770e42aea41fedb088767a2832071ab..2128b9dbc2d92b76a124cb7d2b15f555d4e20ce4 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -46,6 +46,7 @@
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/base/chrome_process_util.h"
#include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/test_launcher_utils.h"
#include "chrome/test/base/test_switches.h"
#include "content/common/debug_flags.h"
#include "googleurl/src/gurl.h"
@@ -175,6 +176,9 @@ void UITestBase::SetLaunchSwitches() {
// chrome/test/pyautolib/pyauto.py as well to take effect for all tests
// on chromeos.
+ // Propagate commandline settings from test_launcher_utils.
+ test_launcher_utils::PrepareBrowserCommandLineForTests(&launch_arguments_);
+
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWaitForDebugger))
launch_arguments_.AppendSwitch(switches::kWaitForDebugger);
« no previous file with comments | « chrome/test/automation/proxy_launcher.cc ('k') | chrome/test/webdriver/webdriver_automation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698