diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 01:32:09 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 01:32:09 +0000 |
| commit | b2f665f572588f0fd1dcdfaafe10f10892cbddc1 (patch) | |
| tree | 5ef5396d81be3be49b6bcd22142306097b36f806 /chrome/browser/extensions | |
| parent | 920172d9f36160f55f11005db457dbf4ca59e145 (diff) | |
| download | chromium_src-b2f665f572588f0fd1dcdfaafe10f10892cbddc1.zip chromium_src-b2f665f572588f0fd1dcdfaafe10f10892cbddc1.tar.gz chromium_src-b2f665f572588f0fd1dcdfaafe10f10892cbddc1.tar.bz2 | |
Disable ExtensionsStartupTest.NoFileAccess on Mac.
BUG=48151
TEST=green tree
Review URL: http://codereview.chromium.org/2856029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_startup_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 7566caa..0d056d0 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -144,9 +144,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, Test) { TestInjection(true, true); } +// Sometimes times out on Mac. http://crbug.com/48151 +#if defined(OS_MACOSX) +#define MAYBE_NoFileAccess DISABLED_NoFileAccess +#else +#define MAYBE_NoFileAccess NoFileAccess +#endif // Tests that disallowing file access on an extension prevents it from injecting // script into a page with a file URL. -IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, NoFileAccess) { +IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) { WaitForServicesToStart(4, true); // 1 component extension and 3 others. ExtensionsService* service = browser()->profile()->GetExtensionsService(); |