diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 04:29:37 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 04:29:37 +0000 |
| commit | 63c046a84108d117950b4e1edbcf7a7210ec68de (patch) | |
| tree | 9c566195f5cf8d625c585d5010341d2d77971f55 /chrome/test/webdriver | |
| parent | dcbf05d1e15e8d13e5e2a0ff59a3df143d15e184 (diff) | |
| download | chromium_src-63c046a84108d117950b4e1edbcf7a7210ec68de.zip chromium_src-63c046a84108d117950b4e1edbcf7a7210ec68de.tar.gz chromium_src-63c046a84108d117950b4e1edbcf7a7210ec68de.tar.bz2 | |
Revert 151904 (speculative, possibly broke
login_CryptohomeIncognitoUnmounted on ChromiumOS (amd64)
) - [ChromeDriver] Disable some unnecessary chrome services at startup.
These services make background network requests and aren't needed for
website testing.
BUG=none
TEST=none
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10837271
TBR=kkania@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10857050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/webdriver')
| -rw-r--r-- | chrome/test/webdriver/test/chromedriver_tests.py | 1 | ||||
| -rw-r--r-- | chrome/test/webdriver/webdriver_automation.cc | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/chrome/test/webdriver/test/chromedriver_tests.py b/chrome/test/webdriver/test/chromedriver_tests.py index aab3b90..ae9e0a0 100644 --- a/chrome/test/webdriver/test/chromedriver_tests.py +++ b/chrome/test/webdriver/test/chromedriver_tests.py @@ -1036,7 +1036,6 @@ class GeolocationTest(ChromeDriverTest): def testGeolocation(self): """Tests the get and set geolocation commands.""" driver = self.GetNewDriver() - driver.get(self.GetTestDataUrl() + '/empty.html') # TODO(kkania): Update the python bindings and get rid of these. driver.command_executor._commands.update({ diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc index 630132e..8230266 100644 --- a/chrome/test/webdriver/webdriver_automation.cc +++ b/chrome/test/webdriver/webdriver_automation.cc @@ -364,13 +364,8 @@ void Automation::Init( command.AppendSwitch(switches::kFullMemoryCrashReport); command.AppendSwitch(switches::kNoDefaultBrowserCheck); command.AppendSwitch(switches::kNoFirstRun); - command.AppendSwitch(switches::kDisableBackgroundNetworking); - command.AppendSwitch(switches::kDisableSync); - command.AppendSwitch(switches::kDisableTranslate); command.AppendSwitch(switches::kDisableWebResources); command.AppendSwitch(switches::kSbDisableAutoUpdate); - command.AppendSwitch(switches::kSbDisableDownloadProtection); - command.AppendSwitch(switches::kDisableClientSidePhishingDetection); command.AppendSwitch(switches::kDisableComponentUpdate); command.AppendSwitch(switches::kDisableDefaultApps); #if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -384,7 +379,7 @@ void Automation::Init( if (options.ignore_certificate_errors) command.AppendSwitch(switches::kIgnoreCertificateErrors); if (options.user_data_dir.empty()) - command.AppendArg(chrome::kAboutBlankURL); + command.AppendSwitchASCII(switches::kHomePage, chrome::kAboutBlankURL); command.AppendArguments(options.command, true /* include_program */); |