Commit 63c046a8 authored by thakis@chromium.org's avatar thakis@chromium.org

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
parent dcbf05d1
...@@ -1036,7 +1036,6 @@ class GeolocationTest(ChromeDriverTest): ...@@ -1036,7 +1036,6 @@ class GeolocationTest(ChromeDriverTest):
def testGeolocation(self): def testGeolocation(self):
"""Tests the get and set geolocation commands.""" """Tests the get and set geolocation commands."""
driver = self.GetNewDriver() driver = self.GetNewDriver()
driver.get(self.GetTestDataUrl() + '/empty.html')
# TODO(kkania): Update the python bindings and get rid of these. # TODO(kkania): Update the python bindings and get rid of these.
driver.command_executor._commands.update({ driver.command_executor._commands.update({
......
...@@ -364,13 +364,8 @@ void Automation::Init( ...@@ -364,13 +364,8 @@ void Automation::Init(
command.AppendSwitch(switches::kFullMemoryCrashReport); command.AppendSwitch(switches::kFullMemoryCrashReport);
command.AppendSwitch(switches::kNoDefaultBrowserCheck); command.AppendSwitch(switches::kNoDefaultBrowserCheck);
command.AppendSwitch(switches::kNoFirstRun); command.AppendSwitch(switches::kNoFirstRun);
command.AppendSwitch(switches::kDisableBackgroundNetworking);
command.AppendSwitch(switches::kDisableSync);
command.AppendSwitch(switches::kDisableTranslate);
command.AppendSwitch(switches::kDisableWebResources); command.AppendSwitch(switches::kDisableWebResources);
command.AppendSwitch(switches::kSbDisableAutoUpdate); command.AppendSwitch(switches::kSbDisableAutoUpdate);
command.AppendSwitch(switches::kSbDisableDownloadProtection);
command.AppendSwitch(switches::kDisableClientSidePhishingDetection);
command.AppendSwitch(switches::kDisableComponentUpdate); command.AppendSwitch(switches::kDisableComponentUpdate);
command.AppendSwitch(switches::kDisableDefaultApps); command.AppendSwitch(switches::kDisableDefaultApps);
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
...@@ -384,7 +379,7 @@ void Automation::Init( ...@@ -384,7 +379,7 @@ void Automation::Init(
if (options.ignore_certificate_errors) if (options.ignore_certificate_errors)
command.AppendSwitch(switches::kIgnoreCertificateErrors); command.AppendSwitch(switches::kIgnoreCertificateErrors);
if (options.user_data_dir.empty()) if (options.user_data_dir.empty())
command.AppendArg(chrome::kAboutBlankURL); command.AppendSwitchASCII(switches::kHomePage, chrome::kAboutBlankURL);
command.AppendArguments(options.command, true /* include_program */); command.AppendArguments(options.command, true /* include_program */);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment