Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / bookmarks / bookmark_browsertest.cc

diff --git a/src/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/src/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
index e54c2c7..66a07d0 100644 (file)
--- a/src/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
+++ b/src/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
@@ -85,7 +85,14 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, PRE_Persist) {
       base::ASCIIToUTF16(kPersistBookmarkTitle));
 }
 
-IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, Persist) {
+#if defined(THREAD_SANITIZER)
+// BookmarkBrowsertest.Persist fails under ThreadSanitizer on Linux, see
+// http://crbug.com/340223.
+#define MAYBE_Persist DISABLED_Persist
+#else
+#define MAYBE_Persist Persist
+#endif
+IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, MAYBE_Persist) {
   BookmarkModel* bookmark_model = WaitForBookmarkModel(browser()->profile());
 
   std::vector<BookmarkService::URLAndTitle> urls;