Rename FeatureObserver to UseCounter to make clear that all it stores are usage counts.

Source/WebCore/page/ContentSecurityPolicy.cpp

 /*
  * Copyright (C) 2011 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 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "ContentSecurityPolicy.h"
 
 #include "Console.h"
 #include "DOMStringList.h"
 #include "Document.h"
-#include "FeatureObserver.h"
+#include "UseCounter.h"
 #include "FormData.h"
 #include "FormDataList.h"
 #include "Frame.h"
 #include "InspectorInstrumentation.h"
 #include "InspectorValues.h"
 #include "KURL.h"
 #include "PingLoader.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SchemeRegistry.h"
 #include "ScriptCallStack.h"
@@ skipping 97 matching lines @@
         || equalIgnoringCase(name, scriptSrc)
         || equalIgnoringCase(name, styleSrc)
         || equalIgnoringCase(name, baseURI)
         || equalIgnoringCase(name, formAction)
         || equalIgnoringCase(name, pluginTypes)
         || equalIgnoringCase(name, scriptNonce)
         || equalIgnoringCase(name, reflectedXSS)
     );
 }
 
-FeatureObserver::Feature getFeatureObserverType(ContentSecurityPolicy::HeaderType type)
+UseCounter::Feature getUseCounterType(ContentSecurityPolicy::HeaderType type)
 {
     switch (type) {
     case ContentSecurityPolicy::PrefixedEnforce:
-        return FeatureObserver::PrefixedContentSecurityPolicy;
+        return UseCounter::PrefixedContentSecurityPolicy;
     case ContentSecurityPolicy::Enforce:
-        return FeatureObserver::ContentSecurityPolicy;
+        return UseCounter::ContentSecurityPolicy;
     case ContentSecurityPolicy::PrefixedReport:
-        return FeatureObserver::PrefixedContentSecurityPolicyReportOnly;
+        return UseCounter::PrefixedContentSecurityPolicyReportOnly;
     case ContentSecurityPolicy::Report:
-        return FeatureObserver::ContentSecurityPolicyReportOnly;
+        return UseCounter::ContentSecurityPolicyReportOnly;
     }
     ASSERT_NOT_REACHED();
-    return FeatureObserver::NumberOfFeatures;
+    return UseCounter::NumberOfFeatures;
 }
 
 const ScriptCallFrame& getFirstNonNativeFrame(PassRefPtr<ScriptCallStack> stack)
 {
     int frameNumber = 0;
     if (!stack->at(0).lineNumber() && stack->size() > 1 && stack->at(1).lineNumber())
         frameNumber = 1;
 
     return stack->at(frameNumber);
 }
@@ skipping 1277 matching lines @@
     ASSERT(m_policies.isEmpty());
     for (CSPDirectiveListVector::const_iterator iter = other->m_policies.begin(); iter != other->m_policies.end(); ++iter)
         didReceiveHeader((*iter)->header(), (*iter)->headerType());
 }
 
 void ContentSecurityPolicy::didReceiveHeader(const String& header, HeaderType type)
 {
     if (m_scriptExecutionContext->isDocument()) {
         Document* document = toDocument(m_scriptExecutionContext);
         if (document->domWindow())
-            FeatureObserver::observe(document->domWindow(), getFeatureObserverType(type));
+            UseCounter::observe(document->domWindow(), getUseCounterType(type));
     }
 
     // RFC2616, section 4.2 specifies that headers appearing multiple times can
     // be combined with a comma. Walk the header string, and parse each comma
     // separated chunk as a separate header.
     const UChar* begin = header.characters();
     const UChar* position = begin;
     const UChar* end = begin + header.length();
     while (position < end) {
         skipUntil(position, end, ',');
@@ skipping 406 matching lines @@
 {
     InspectorInstrumentation::scriptExecutionBlockedByCSP(m_scriptExecutionContext, directiveText);
 }
 
 bool ContentSecurityPolicy::experimentalFeaturesEnabled() const
 {
     return RuntimeEnabledFeatures::experimentalContentSecurityPolicyFeaturesEnabled();
 }
 
 }