summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authordgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 23:14:17 +0000
committerdgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 23:14:17 +0000
commit9b86ac6b5de33acc46af4ed709d54328370f10f9 (patch)
tree33e04775a6a062a81727ba9e867e31ec7de2f8ba /chrome/browser/bookmarks
parent6f46e21af6bbc9591b594f3b4eb0db79419021c6 (diff)
downloadchromium_src-9b86ac6b5de33acc46af4ed709d54328370f10f9.zip
chromium_src-9b86ac6b5de33acc46af4ed709d54328370f10f9.tar.gz
chromium_src-9b86ac6b5de33acc46af4ed709d54328370f10f9.tar.bz2
Disable 6 ExtensionApiTests on win asan
BUG=166026 R=achuith@chromium.org TBR=sky@chromium.org Review URL: https://codereview.chromium.org/11574017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc b/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc
index 63b5400..76d4c56 100644
--- a/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc
+++ b/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc
@@ -15,7 +15,13 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/ui_test_utils.h"
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BookmarkManager) {
+// Times out on win asan, http://crbug.com/166026
+#if defined(OS_WIN) && defined(ADDRESS_SANITIZER)
+#define MAYBE_BookmarkManager DISABLED_BookmarkManager
+#else
+#define MAYBE_BookmarkManager BookmarkManager
+#endif
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_BookmarkManager) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis);