Disabling UseCounterTest.SVGImageContext and InspectorDisablesMeasurement 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/FrameHost.h"
 #include "core/frame/UseCounter.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/testing/HistogramTester.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 169 matching lines @@
       UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(CSSPropertyZoom),
       1);
   histogramTester.expectBucketCount(kLegacyCSSHistogramName, 1, 2);
   histogramTester.expectTotalCount(kLegacyCSSHistogramName, 5);
 
   // None of this should update any of the SVG histograms
   histogramTester.expectTotalCount(kSVGFeaturesHistogramName, 0);
   histogramTester.expectTotalCount(kSVGCSSHistogramName, 0);
 }
 
-TEST(UseCounterTest, SVGImageContext) {
+// Failing on Android: crbug.com/667913
+#if OS(ANDROID)
+#define MAYBE_SVGImageContext DISABLED_SVGImageContext
+#else
+#define MAYBE_SVGImageContext SVGImageContext
+#endif
+
+TEST(UseCounterTest, MAYBE_SVGImageContext) {
   UseCounter useCounter(UseCounter::SVGImageContext);
   HistogramTester histogramTester;
 
   // Verify that SVGImage related feature counters get recorded in a separate
   // histogram.
   EXPECT_FALSE(
       useCounter.hasRecordedMeasurement(UseCounter::SVGSMILAdditiveAnimation));
   useCounter.recordMeasurement(UseCounter::SVGSMILAdditiveAnimation);
   EXPECT_TRUE(
       useCounter.hasRecordedMeasurement(UseCounter::SVGSMILAdditiveAnimation));
@@ skipping 28 matching lines @@
       UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(CSSPropertyFont),
       1);
   histogramTester.expectBucketCount(kLegacyCSSHistogramName, 1, 1);
   histogramTester.expectTotalCount(kLegacyCSSHistogramName, 2);
 
   // None of this should update the non-legacy non-SVG histograms
   histogramTester.expectTotalCount(kCSSHistogramName, 0);
   histogramTester.expectTotalCount(kFeaturesHistogramName, 0);
 }
 
+// Failing on Android: crbug.com/667913
+#if OS(ANDROID)
+#define MAYBE_InspectorDisablesMeasurement DISABLED_InspectorDisablesMeasurement
+#else
+#define MAYBE_InspectorDisablesMeasurement InspectorDisablesMeasurement
+#endif
+
 TEST(UseCounterTest, InspectorDisablesMeasurement) {
   UseCounter useCounter;
   HistogramTester histogramTester;
 
   // The specific feature we use here isn't important.
   UseCounter::Feature feature = UseCounter::Feature::SVGSMILElementInDocument;
   CSSPropertyID property = CSSPropertyFontWeight;
   CSSParserMode parserMode = HTMLStandardMode;
 
   EXPECT_FALSE(useCounter.hasRecordedMeasurement(feature));
@@ skipping 75 matching lines @@
 
   m_deprecation.unmuteForInspector();
   Deprecation::warnOnDeprecatedProperties(frame(), property);
   // TODO: use the actually deprecated property to get a deprecation message.
   EXPECT_FALSE(m_deprecation.isSuppressed(property));
   Deprecation::countDeprecation(frame(), feature);
   EXPECT_TRUE(m_useCounter.hasRecordedMeasurement(feature));
 }
 
 }  // namespace blink