summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 18:55:13 +0000
committerjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 18:55:13 +0000
commitc6e6617d80159e7c1dbf00ebf44f82b52f89f4ff (patch)
tree874da9e5d1e131812444bda446e88d7ad65d980c /chrome
parent0d74d4198116eeb86e6dd74f311b4e7980efae6a (diff)
downloadchromium_src-c6e6617d80159e7c1dbf00ebf44f82b52f89f4ff.zip
chromium_src-c6e6617d80159e7c1dbf00ebf44f82b52f89f4ff.tar.gz
chromium_src-c6e6617d80159e7c1dbf00ebf44f82b52f89f4ff.tar.bz2
Disable NoInfobarForAllowedOrigin on Win.
BUG=100763 TEST= TBR=bulach@chromium.org Review URL: http://codereview.chromium.org/8342006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/geolocation/geolocation_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 2ef5f8f..86e0823 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -444,7 +444,13 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForDeniedOrigin) {
CheckStringValueFromJavascript("1", "geoGetLastError()");
}
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoInfobarForAllowedOrigin) {
+// http://crbug.com/100763. Crashes occasionally on XP.
+#if defined(OS_WIN)
+#define MAYBE_NoInfobarForAllowedOrigin DISABLED_NoInfobarForAllowedOrigin
+#else
+#define MAYBE_NoInfobarForAllowedOrigin NoInfobarForAllowedOrigin
+#endif
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForAllowedOrigin) {
ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
current_browser_->profile()->GetHostContentSettingsMap()->
SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(current_url_),