Revert "[Sheriff] Disable...

Revert "[Sheriff] Disable MediaHistoryBrowserTest.DoNotRecordWatchtime_Background/0 and DoNotRecordWatchtime_Muted/0 flaky on 6 builders."

This reverts commit 33fe2fc7.

Reason for revert: Will revert original CL, rather than disabling on more platforms.

Original change's description:
> [Sheriff] Disable MediaHistoryBrowserTest.DoNotRecordWatchtime_Background/0 and DoNotRecordWatchtime_Muted/0 flaky on 6 builders.
> 
> The builders are linux-chromeos-dbg, Mac ASan 64 Tests (1), Linux ChromiumOS MSan Tests,
> Win7 Tests (dbg)(1), Linux Tests (dbg)(1), and Linux CFI.
> 
> Bug: 1086794
> Change-Id: If0b9d37b3d4662880916f26b8acfc5612200e075
> Tbr: beccahughes@chromium.org
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216098
> Commit-Queue: Takashi Sakamoto <tasak@google.com>
> Reviewed-by: Takashi Sakamoto <tasak@google.com>
> Cr-Commit-Position: refs/heads/master@{#772101}

TBR=tasak@google.com

Change-Id: Ieecb200736154d52763f397548bad284eae6eceb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1086794
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2217552Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772154}

chrome/browser/media/history/media_history_browsertest.cc

@@ -1254,18 +1254,8 @@ IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
   }
 }
 
-#if (defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)) && \
-    !defined(NDEBUG)
-// TODO(1086794): failing on linux-chromeos-dbg, Linux Tests(dbg)(1) and Win7
-// Tests(dbg).
-#define MAYBE_DoNotRecordWatchtime_Background \
-  DISABLED_DoNotRecordWatchtime_Background
-#else
-#define MAYBE_DoNotRecordWatchtime_Background DoNotRecordWatchtime_Background
-#endif
-
 IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
-                       MAYBE_DoNotRecordWatchtime_Background) {
+                       DoNotRecordWatchtime_Background) {
   auto* browser = CreateBrowserFromParam();
   auto* service = GetMediaHistoryService(browser);
 
@@ -1290,17 +1280,7 @@ IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
   EXPECT_TRUE(playbacks.empty());
 }
 
-#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && \
-    (defined(IS_CFI) || !defined(NDEBUG) || defined(ADDRESS_SANITIZER))
-// TODO(1086794): failing on linux-chromeos-dbg, Linux Tests(dbg)(1) and Linux
-// CFI.
-#define MAYBE_DoNotRecordWatchtime_Muted DISABLED_DoNotRecordWatchtime_Muted
-#else
-#define MAYBE_DoNotRecordWatchtime_Muted DoNotRecordWatchtime_Muted
-#endif
-
-IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
-                       MAYBE_DoNotRecordWatchtime_Muted) {
+IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest, DoNotRecordWatchtime_Muted) {
   auto* browser = CreateBrowserFromParam();
   auto* service = GetMediaHistoryService(browser);