diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 22:14:52 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 22:14:52 +0000 |
| commit | eed5efa1c147c58a9c8339b4e61b4ca5db1516e2 (patch) | |
| tree | 8f376b345b60a18e0ce0e5a52b9529408716eeb8 /chrome/browser/geolocation | |
| parent | e434153a055e25fb2a8816a30007ac48f6e2cdc3 (diff) | |
| download | chromium_src-eed5efa1c147c58a9c8339b4e61b4ca5db1516e2.zip chromium_src-eed5efa1c147c58a9c8339b4e61b4ca5db1516e2.tar.gz chromium_src-eed5efa1c147c58a9c8339b4e61b4ca5db1516e2.tar.bz2 | |
Disable DisplaysPermissionBar on Mac.
BUG=98910
TEST=None
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/7529010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 01cf36e..776a429 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -378,7 +378,13 @@ class GeolocationBrowserTest : public InProcessBrowserTest { scoped_refptr<GeolocationArbitratorDependencyFactory> dependency_factory_; }; -IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DisplaysPermissionBar) { +#if defined(OS_MACOSX) +// DisplaysPermissionBar is flaky on Mac, see http://crbug.com/90910 . +#define MAYBE_DisplaysPermissionBar DISABLED_DisplaysPermissionBar +#else // defined(OS_MACOSX) +#define MAYBE_DisplaysPermissionBar DisplaysPermissionBar +#endif +IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_DisplaysPermissionBar) { ASSERT_TRUE(Initialize(INITIALIZATION_NONE)); AddGeolocationWatch(true); } |