Re-enable UseCounterTests on Android

third_party/WebKit/Source/core/frame/UseCounterTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/Deprecation.h"
 #include "core/frame/UseCounter.h"
 #include "core/page/Page.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/testing/HistogramTester.h"
 #include "platform/testing/URLTestHelpers.h"
@@ skipping 96 matching lines @@
                                        histogram_map(second_item), 1);
     histogram_tester.ExpectBucketCount(legacy_histogram, page_visit_bucket, 2);
     histogram_tester.ExpectTotalCount(legacy_histogram, 5);
   }
 
   for (size_t i = 0; i < unaffected_histograms.size(); ++i) {
     histogram_tester.ExpectTotalCount(unaffected_histograms[i], 0);
   }
 }
 
-// Failing on Android: crbug.com/667913
-#if OS(ANDROID)
-#define MAYBE_RecordingFeatures DISABLED_RecordingFeatures
-#else
-#define MAYBE_RecordingFeatures RecordingFeatures
-#endif
-TEST(UseCounterTest, MAYBE_RecordingFeatures) {
+TEST(UseCounterTest, RecordingFeatures) {
   UseCounter use_counter;
   HistogramBasicTest<UseCounter::Feature>(
       kFeaturesHistogramName, kLegacyFeaturesHistogramName,
       {kSVGFeaturesHistogramName, kSVGCSSHistogramName,
        kSVGAnimatedCSSHistogramName},
       UseCounter::kFetch, UseCounter::kFetchBodyStream,
       [&](UseCounter::Feature feature) -> bool {
         return use_counter.HasRecordedMeasurement(feature);
       },
       [&](UseCounter::Feature feature) {
@@ skipping 34 matching lines @@
         return use_counter.IsCountedAnimatedCSS(property);
       },
       [&](CSSPropertyID property) { use_counter.CountAnimatedCSS(property); },
       [](CSSPropertyID property) -> int {
         return UseCounter::MapCSSPropertyIdToCSSSampleIdForHistogram(property);
       },
       [&](KURL kurl) { use_counter.DidCommitLoad(kurl); },
       "https://dummysite.com/", 1 /* page visit bucket */);
 }
 
-// Failing on Android: crbug.com/667913
-#if OS(ANDROID)
-#define MAYBE_SVGImageContextFeatures DISABLED_SVGImageContextFeatures
-#else
-#define MAYBE_SVGImageContextFeatures SVGImageContextFeatures
-#endif
-TEST(UseCounterTest, MAYBE_SVGImageContextFeatures) {
+TEST(UseCounterTest, SVGImageContextFeatures) {
   UseCounter use_counter(UseCounter::kSVGImageContext);
   HistogramBasicTest<UseCounter::Feature>(
       kSVGFeaturesHistogramName, kLegacyFeaturesHistogramName,
       {kFeaturesHistogramName, kCSSHistogramName, kAnimatedCSSHistogramName},
       UseCounter::kSVGSMILAdditiveAnimation,
       UseCounter::kSVGSMILAnimationElementTiming,
       [&](UseCounter::Feature feature) -> bool {
         return use_counter.HasRecordedMeasurement(feature);
       },
       [&](UseCounter::Feature feature) {
@@ skipping 36 matching lines @@
       },
       [&](CSSPropertyID property) { use_counter.CountAnimatedCSS(property); },
       [](CSSPropertyID property) -> int {
         return UseCounter::MapCSSPropertyIdToCSSSampleIdForHistogram(property);
       },
       [&](KURL kurl) { use_counter.DidCommitLoad(kurl); }, "about:blank",
       // In practice SVGs always appear to be loaded with an about:blank URL
       1 /* page visit bucket */);
 }
 
-// Failing on Android: crbug.com/667913
-#if OS(ANDROID)
-#define MAYBE_InspectorDisablesMeasurement DISABLED_InspectorDisablesMeasurement
-#else
-#define MAYBE_InspectorDisablesMeasurement InspectorDisablesMeasurement
-#endif
-TEST(UseCounterTest, MAYBE_InspectorDisablesMeasurement) {
+TEST(UseCounterTest, InspectorDisablesMeasurement) {
   UseCounter use_counter;
   HistogramTester histogram_tester;
 
   // The specific feature we use here isn't important.
   UseCounter::Feature feature = UseCounter::Feature::kSVGSMILElementInDocument;
   CSSPropertyID property = CSSPropertyFontWeight;
   CSSParserMode parser_mode = kHTMLStandardMode;
 
   EXPECT_FALSE(use_counter.HasRecordedMeasurement(feature));
 
@@ skipping 46 matching lines @@
                                     visits_count + feature_count);
   histogram_tester.ExpectBucketCount(kCSSHistogramName, 1, visits_count);
   histogram_tester.ExpectBucketCount(
       kCSSHistogramName,
       UseCounter::MapCSSPropertyIdToCSSSampleIdForHistogram(property),
       property_count);
   histogram_tester.ExpectTotalCount(kCSSHistogramName,
                                     visits_count + property_count);
 }
 
-// Failing on Android: crbug.com/667913
-#if OS(ANDROID)
-#define MAYBE_MutedDocuments DISABLED_MutedDocuments
-#else
-#define MAYBE_MutedDocuments MutedDocuments
-#endif
-TEST(UseCounterTest, MAYBE_MutedDocuments) {
+TEST(UseCounterTest, MutedDocuments) {
   UseCounter use_counter;
   HistogramTester histogram_tester;
 
   // Counters triggered before any load are always reported.
   use_counter.RecordMeasurement(UseCounter::kFetch);
   use_counter.Count(kHTMLStandardMode, CSSPropertyFontWeight);
   ExpectHistograms(histogram_tester, 0, UseCounter::kFetch, 1,
                    CSSPropertyFontWeight, 1);
 
   // Loading an internal page doesn't bump PageVisits and metrics not reported.
@@ skipping 113 matching lines @@
 
   deprecation_.UnmuteForInspector();
   Deprecation::WarnOnDeprecatedProperties(GetFrame(), property);
   // TODO: use the actually deprecated property to get a deprecation message.
   EXPECT_FALSE(deprecation_.IsSuppressed(property));
   Deprecation::CountDeprecation(GetFrame(), feature);
   EXPECT_TRUE(use_counter_.HasRecordedMeasurement(feature));
 }
 
 }  // namespace blink