Minor UseCounter clean-ups

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

 /*
  * Copyright (C) 2012 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1312 matching lines @@
     // NOTE: only for use in testing.
     static bool isCounted(Document&, const String&);
     bool isCounted(CSSPropertyID unresolvedProperty);
 
     void didCommitLoad();
 
     static UseCounter* getFrom(const Document*);
     static UseCounter* getFrom(const CSSStyleSheet*);
     static UseCounter* getFrom(const StyleSheetContents*);
 
-    static int mapCSSPropertyIdToCSSSampleIdForHistogram(int id);
+    static int mapCSSPropertyIdToCSSSampleIdForHistogram(CSSPropertyID);
 
     void muteForInspector();
     void unmuteForInspector();
 
     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;
 };
 
 } // namespace blink
 
 #endif // UseCounter_h