diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-23 04:27:42 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-23 04:27:42 +0000 |
| commit | aad1dcf7c95ee59a48ad27b3108128f77b19e915 (patch) | |
| tree | ba08602b624e023ee81907c66cf420f79b857f7f /chrome/test | |
| parent | e74eb8a81ebe7a30ca21413ea482931fdf0bea54 (diff) | |
| download | chromium_src-aad1dcf7c95ee59a48ad27b3108128f77b19e915.zip chromium_src-aad1dcf7c95ee59a48ad27b3108128f77b19e915.tar.gz chromium_src-aad1dcf7c95ee59a48ad27b3108128f77b19e915.tar.bz2 | |
Landing http://codereview.chromium.org/6894022/ on behalf of dgozman@ since my other CL depends on it.
I need to add few test tweaks that will let us skip testing breaks coming from the fact that this extension is on by default in ChromeOS. These will be removed once this end up being non-component extension - see http://crbug.com/14463
Picasa uploader changes:
- accept multiple files at once;
- better css for preview images;
- fix for loading problem;
- removed testing code.
BUG=chromium-os:14346,chromium-os:14370
TEST=make sure Picasa uploader works for real from file browser
TBR=dgozman
Review URL: http://codereview.chromium.org/6898013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 4 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 16fb56c..c76593b 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -139,6 +139,10 @@ void InProcessBrowserTest::SetUp() { // Disable audio mixer as it can cause hang. // see http://crosbug.com/17058. chromeos::AudioHandler::Disable(); + + // Prevent loading ChromeOS component extension to prevent their interference + // with other browser tests. + command_line->AppendSwitch(switches::kSkipChromeOSComponents); #endif // defined(OS_CHROMEOS) SandboxInitWrapper sandbox_wrapper; diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 1ccb519..c8063c1 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -187,6 +187,9 @@ void UITestBase::SetLaunchSwitches() { launch_arguments_.AppendSwitchASCII(switches::kHomePage, homepage_); if (!test_name_.empty()) launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_); +#if defined(OS_CHROMEOS) + launch_arguments_.AppendSwitch(switches::kSkipChromeOSComponents); +#endif } void UITestBase::LaunchBrowser() { |