Minor UseCounter clean-ups

third_party/WebKit/Source/core/frame/UseCounter.h

Index: third_party/WebKit/Source/core/frame/UseCounter.h
diff --git a/third_party/WebKit/Source/core/frame/UseCounter.h b/third_party/WebKit/Source/core/frame/UseCounter.h
index 66318866ae192a0eeebee04c38a54d2b2bc9adcf..9a2e17e154aa58679e734fb11b97ebb20bfd3112 100644
--- a/third_party/WebKit/Source/core/frame/UseCounter.h
+++ b/third_party/WebKit/Source/core/frame/UseCounter.h
@@ -1330,7 +1330,7 @@ public:
     static UseCounter* getFrom(const CSSStyleSheet*);
     static UseCounter* getFrom(const StyleSheetContents*);
 
-    static int mapCSSPropertyIdToCSSSampleIdForHistogram(int id);
+    static int mapCSSPropertyIdToCSSSampleIdForHistogram(CSSPropertyID);
 
     void muteForInspector();
     void unmuteForInspector();
@@ -1338,40 +1338,13 @@ public:
     void recordMeasurement(Feature);
     void updateMeasurements();
 
-    bool hasRecordedMeasurement(Feature feature) const { return m_countBits.hasRecordedMeasurement(feature); }
-
-    class CountBits {
-        DISALLOW_NEW();
-    public:
-        CountBits() : m_bits(NumberOfFeatures) { }
-
-        bool hasRecordedMeasurement(Feature feature) const
-        {
-            ASSERT(feature != PageDestruction); // PageDestruction is reserved as a scaling factor.
-            ASSERT(feature < NumberOfFeatures);
-
-            return m_bits.quickGet(feature);
-        }
-
-        void recordMeasurement(Feature feature)
-        {
-            ASSERT(feature != PageDestruction); // PageDestruction is reserved as a scaling factor.
-            ASSERT(feature < NumberOfFeatures);
-
-            m_bits.quickSet(feature);
-        }
-
-        void updateMeasurements();
-
-    private:
-        BitVector m_bits;
-    };
+    bool hasRecordedMeasurement(Feature) const;
 
 protected:
     friend class UseCounterTest;
     unsigned m_muteCount;
 
-    CountBits m_countBits;
+    BitVector m_featureBits;
     BitVector m_CSSFeatureBits;
 };