Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

9 files changed, 4 insertions, 172 deletions

diff --git a/base/data/valgrind/DIRECTORY_MOVED b/base/data/valgrind/DIRECTORY_MOVED
new file mode 100644
index 0000000..96449fe
--- /dev/null
+++ b/base/data/valgrind/DIRECTORY_MOVED
@@ -0,0 +1,4 @@
+For those who got a merge conflict in this directory on update:
+The files from this dir has been moved to tools/valgrind/gtest_exclude
+
+TODO(timurrrr): remove this in a couple of weeks
diff --git a/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt b/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt
deleted file mode 100644
index b73fa61..0000000
--- a/base/data/valgrind/base_unittests.gtest-drmemory_win32.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dr. Memory crashes on some COM calls:
-# http://code.google.com/p/drmemory/issues/detail?id=21
-WMI*
-
-# TODO(timurrrr) investigate the failures and enable these tests one-by-one.
-RSA*
-GmockTest.*
-EtwTrace*
-StatsTableTest.*
-ProcessUtilTest.EnableLFH
-ScopedNativeLibrary.Basic
diff --git a/base/data/valgrind/base_unittests.gtest-tsan.txt b/base/data/valgrind/base_unittests.gtest-tsan.txt
deleted file mode 100644
index 1f81bea..0000000
--- a/base/data/valgrind/base_unittests.gtest-tsan.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Don't run this test under TSan, it takes ~1-2 minutes to pass.
-ProcessUtilTest.GetAppOutputRestrictedNoZombies
-
-# Don't run Memcheck sanity tests under ThreadSanitizer since they can
-# corrupt memory.
-ToolsSanityTest.*Memory*
-ToolsSanityTest.*Delete*
-
-# TSan doesn't understand SharedMemory locks, see http://crbug.com/45083
-StatsTableTest.*MultipleThreads
diff --git a/base/data/valgrind/base_unittests.gtest-tsan_mac.txt b/base/data/valgrind/base_unittests.gtest-tsan_mac.txt
deleted file mode 100644
index 7ee06a1..0000000
--- a/base/data/valgrind/base_unittests.gtest-tsan_mac.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# http://crbug.com/29855.
-StackTrace.OutputToStream
diff --git a/base/data/valgrind/base_unittests.gtest-tsan_win32.txt b/base/data/valgrind/base_unittests.gtest-tsan_win32.txt
deleted file mode 100644
index 0207c09..0000000
--- a/base/data/valgrind/base_unittests.gtest-tsan_win32.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Occasionally fails under TSan, see http://crbug.com/54229
-ProcessUtilTest.CalcFreeMemory
-
-# This file is copied from Valgrind-on-Wine filter
-# TODO(timurrrr): include/investigate the listed tests one-by-one
-EtwTraceControllerTest.EnableDisable
-EtwTraceConsumer*Test.*
-EtwTraceProvider*Test.*
-JSONReaderTest.Reading
-TimeTicks.*
-WMIUtilTest.*
-
-# Too slow under TSan
-RSAPrivateKeyUnitTest.*
-ConditionVariableTest.LargeFastTaskTest
diff --git a/base/data/valgrind/base_unittests.gtest.txt b/base/data/valgrind/base_unittests.gtest.txt
deleted file mode 100644
index 173defa..0000000
--- a/base/data/valgrind/base_unittests.gtest.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# This test currently times out in valgrind, see http://crbug.com/9194
-WatchdogTest.AlarmTest
-
-# These tests occassionally hangs under Valgrind on Mac. valgrind-darwin r9573
-# Revisit with better valgrind.
-# Valgrind bug: https://bugs.kde.org/show_bug.cgi?id=189661
-TimerTest.RepeatingTimer
-TimerTest.RepeatingTimer_Cancel
-
-# Crashes occasionally, see http://crbug.com/7477
-ObserverListThreadSafeTest.CrossThreadObserver
-ObserverListThreadSafeTest.CrossThreadNotifications
-
-# Hangs sometimes on linux, see http://crbug.com/22138
-ClipboardTest.*
-
-# These tests trigger a CHECK so they will leak memory.  They don't test
-# anything else, so just disable them on valgrind. Bug 28179.
-OutOfMemoryDeathTest.*
-
-# Flaky under Valgrind, see http://crbug.com/55517
-PlatformFile.TouchGetInfoPlatformFile
diff --git a/base/data/valgrind/base_unittests.gtest_mac.txt b/base/data/valgrind/base_unittests.gtest_mac.txt
deleted file mode 100644
index 46fbf47..0000000
--- a/base/data/valgrind/base_unittests.gtest_mac.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fails on Valgrind/Mac, see http://crbug.com/43972
-ConditionVariableTest.LargeFastTaskTest
-
-# Fails on Valgrind/Mac due to missing syscall wrapper
-# for the symlink() syscall.  See http://crbug.com/44001
-FileUtilTest.NormalizeFilePathSymlinks
-
-# Fails on Valgrind/Mac, see http://crbug.com/53196
-CancellationFlagTest.SetOnDifferentThreadDeathTest
diff --git a/base/data/valgrind/base_unittests.gtest_win32.txt b/base/data/valgrind/base_unittests.gtest_win32.txt
deleted file mode 100644
index 525648c..0000000
--- a/base/data/valgrind/base_unittests.gtest_win32.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Too slow under Valgrind/Wine and TSan/Windows
-TimeTicks.WinRollover
-
-# Very sensitive to slowdown
-TimeTicks.Deltas
-TimeTicks.HighResNow
-TimerTest.RepeatingTimer*
diff --git a/base/data/valgrind/base_unittests.gtest_wine.txt b/base/data/valgrind/base_unittests.gtest_wine.txt
deleted file mode 100644
index 17d3085..0000000
--- a/base/data/valgrind/base_unittests.gtest_wine.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-# crash             Crashes in Wine
-# crash-valgrind    Crashes in Wine + Valgrind
-# dontcare          Safe to ignore
-# dontcare-hangwin  Ignore, hangs on Windows too
-# dontcare-winfail  Ignore, fails on Windows too
-# dontcare-flaky    Ignore, flaky test
-# dontcare-hang     Ignore, hangs we don't care about
-# fail              Fails, needs triaging or needs to be fixed
-# fail-valgrind     Fails only under Valgrind
-# fail_wine_vmware  Fails in Wine under VMware? TODO(dank) clarify
-# flaky-valgrind    Flaky under Valgrind, needs investigation
-# hang              Test that hangs for some reason
-# hang-valgrind     Test that hangs under valgrind, or just takes too long
-
-# dontcare
-BaseWinUtilTest.FormatMessageW
-
-# fail-valgrind
-# fails under wine + valgrind TODO(thestig): investigate
-ConditionVariableTest.LargeFastTaskTest
-
-# hang
-# http://bugs.winehq.org/show_bug.cgi?id=20946, advapi32.ControlTrace() not yet implemented
-EtwTraceControllerTest.EnableDisable
-
-# crash
-# http://bugs.winehq.org/show_bug.cgi?id=20946, advapi32.OpenTrace() unimplemented
-EtwTraceConsumer*Test.*
-
-# crash
-# http://bugs.winehq.org/show_bug.cgi?id=20946, advapi32.RegisterTraceGuids() unimplemented
-EtwTraceProvider*Test.*
-
-# dontcare
-FileUtilTest.CountFilesCreatedAfter
-
-# dontcare
-FileUtilTest.GetFileCreationLocalTime
-
-# fail
-# http://bugs.winehq.org/show_bug.cgi?id=20340
-HMACTest.HMACObjectReuse
-
-# fail
-# http://bugs.winehq.org/show_bug.cgi?id=20340
-HMACTest.HmacSafeBrowsingResponseTest
-
-# fail
-# http://bugs.winehq.org/show_bug.cgi?id=20340
-HMACTest.RFC2202TestCases
-
-# hang-valgrind
-# not really a hang, takes 400 seconds
-JSONReaderTest.Reading
-
-# dontcare
-# Alexandre Julliard triaged
-PEImageTest.EnumeratesPE
-
-# fail-valgrind
-# fails under wine + valgrind TODO(thestig): investigate
-ProcessUtilTest.CalcFreeMemory
-
-# fail-valgrind
-# fails under wine + valgrind TODO(thestig): investigate
-ProcessUtilTest.KillSlowChild
-
-# fail-valgrind
-# fails under wine + valgrind TODO(thestig): investigate
-ProcessUtilTest.SpawnChild
-
-# hang-valgrind
-# not really a hang, takes 300 seconds
-RSAPrivateKeyUnitTest.InitRandomTest
-
-# fail_wine_vmware
-RSAPrivateKeyUnitTest.ShortIntegers
-
-# dontcare-flaky
-# http://bugs.winehq.org/show_bug.cgi?id=20606
-StatsTableTest.MultipleProcesses
-
-# flaky-valgrind
-# flaky, timing issues? TODO(thestig): investigate
-StatsTableTest.StatsCounterTimer
-
-# fail-valgrind
-# fails under wine + valgrind TODO(thestig): investigate
-StatsTableTest.StatsRate
-
-# fail-valgrind
-# fails under wine + valgrind TODO(thestig): investigate
-StatsTableTest.StatsScope
-
-# dontcare
-WMIUtilTest.*