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

Side by Side Diff: chrome/test/webdriver/webdriver_automation.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | chrome/test/webdriver/webdriver_server.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) 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 #include "chrome/test/webdriver/webdriver_automation.h" 5 #include "chrome/test/webdriver/webdriver_automation.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 350
351 void Automation::Init( 351 void Automation::Init(
352 const BrowserOptions& options, 352 const BrowserOptions& options,
353 int* build_no, 353 int* build_no,
354 Error** error) { 354 Error** error) {
355 // Prepare Chrome's command line. 355 // Prepare Chrome's command line.
356 CommandLine command(CommandLine::NO_PROGRAM); 356 CommandLine command(CommandLine::NO_PROGRAM);
357 if (CommandLine::ForCurrentProcess()->HasSwitch("no-sandbox")) { 357 if (CommandLine::ForCurrentProcess()->HasSwitch("no-sandbox")) {
358 command.AppendSwitch(switches::kNoSandbox); 358 command.AppendSwitch(switches::kNoSandbox);
359 } 359 }
360 command.AppendSwitch(switches::kEnableLogging);
361 command.AppendSwitchASCII(switches::kLoggingLevel, "1");
360 command.AppendSwitch(switches::kDisableHangMonitor); 362 command.AppendSwitch(switches::kDisableHangMonitor);
361 command.AppendSwitch(switches::kDisablePromptOnRepost); 363 command.AppendSwitch(switches::kDisablePromptOnRepost);
362 command.AppendSwitch(switches::kDomAutomationController); 364 command.AppendSwitch(switches::kDomAutomationController);
363 command.AppendSwitch(switches::kFullMemoryCrashReport); 365 command.AppendSwitch(switches::kFullMemoryCrashReport);
364 command.AppendSwitch(switches::kNoDefaultBrowserCheck); 366 command.AppendSwitch(switches::kNoDefaultBrowserCheck);
365 command.AppendSwitch(switches::kNoFirstRun); 367 command.AppendSwitch(switches::kNoFirstRun);
368 command.AppendSwitch(switches::kDisableWebResources);
369 command.AppendSwitch(switches::kSbDisableAutoUpdate);
370 command.AppendSwitch(switches::kDisableComponentUpdate);
371 command.AppendSwitch(switches::kDisableDefaultApps);
372 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
373 command.AppendSwitchASCII(switches::kPasswordStore, "basic");
374 #endif
375 #if defined(OS_MACOSX)
376 command.AppendSwitch(switches::kUseMockKeychain);
377 #endif
366 if (options.detach_process) 378 if (options.detach_process)
367 command.AppendSwitch(switches::kAutomationReinitializeOnChannelError); 379 command.AppendSwitch(switches::kAutomationReinitializeOnChannelError);
368 if (options.ignore_certificate_errors) 380 if (options.ignore_certificate_errors)
369 command.AppendSwitch(switches::kIgnoreCertificateErrors); 381 command.AppendSwitch(switches::kIgnoreCertificateErrors);
370 if (options.disable_popup_blocking) 382 if (options.disable_popup_blocking)
371 command.AppendSwitch(switches::kDisablePopupBlocking); 383 command.AppendSwitch(switches::kDisablePopupBlocking);
372 if (options.user_data_dir.empty()) 384 if (options.user_data_dir.empty())
373 command.AppendSwitchASCII(switches::kHomePage, chrome::kAboutBlankURL); 385 command.AppendSwitchASCII(switches::kHomePage, chrome::kAboutBlankURL);
374 386
375 command.AppendArguments(options.command, true /* include_program */); 387 command.AppendArguments(options.command, true /* include_program */);
(...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 } 1204 }
1193 1205
1194 Error* Automation::CheckMaximizeSupported() { 1206 Error* Automation::CheckMaximizeSupported() {
1195 const char* message = 1207 const char* message =
1196 "Maximize automation interface is not supported for this version of " 1208 "Maximize automation interface is not supported for this version of "
1197 "Chrome."; 1209 "Chrome.";
1198 return CheckVersion(1160, message); 1210 return CheckVersion(1160, message);
1199 } 1211 }
1200 1212
1201 } // namespace webdriver 1213 } // namespace webdriver
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | chrome/test/webdriver/webdriver_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698