Reland "Sheriff: Disable flaky test...

Reland "Sheriff: Disable flaky test LocalSiteCharacteristicsDatabaseTest.FaviconUpdateFeatureUsage on Windows"

This is a reland of 8c5a2293

Original change's description:
> Sheriff: Disable flaky test LocalSiteCharacteristicsDatabaseTest.FaviconUpdateFeatureUsage on Windows
>
> TBR=fdoray@chromium.org
> TBR=chrisha@chromium.org
>
> Bug: 1004641
> Change-Id: Iae6046cac12450732ea9b5ceff58f4372a8ac96d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808625
> Reviewed-by: Fergus Dall <sidereal@google.com>
> Cr-Commit-Position: refs/heads/master@{#697107}

TBR=fdoray@chromium.org
TBR=chrisha@chromium.org

Bug: 1004641
Change-Id: I2467757c73f15cf7516238c630ef0f9ab17b228d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808857
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Fergus Dall <sidereal@google.com>
Cr-Commit-Position: refs/heads/master@{#697124}

chrome/browser/resource_coordinator/local_site_characteristics_database_browsertest.cc

@@ -11,6 +11,7 @@
 #include "base/run_loop.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/simple_test_tick_clock.h"
+#include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ -456,8 +457,14 @@ IN_PROC_BROWSER_TEST_F(LocalSiteCharacteristicsDatabaseTest,
 
 // Test that the favicon update feature usage in background gets detected
 // properly.
+// TODO(crbug.com/1004641): Investigate and reenable.
+#if defined(OS_WIN)
+#define MAYBE_FaviconUpdateFeatureUsage DISABLED_FaviconUpdateFeatureUsage
+#else
+#define MAYBE_FaviconUpdateFeatureUsage FaviconUpdateFeatureUsage
+#endif
 IN_PROC_BROWSER_TEST_F(LocalSiteCharacteristicsDatabaseTest,
-                       FaviconUpdateFeatureUsage) {
+                       MAYBE_FaviconUpdateFeatureUsage) {
   TestFeatureUsageDetection(
       &SiteCharacteristicsDataReader::UpdatesFaviconInBackground,
       internal::LocalSiteCharacteristicsDataImpl::TrackedBackgroundFeatures::