diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 03:38:21 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 03:38:21 +0000 |
| commit | 4de4c181a016b7ff4c19a4082348799a83223615 (patch) | |
| tree | a52c33fd579b1d33de73b788ef09b2a4b87ae06d /webkit/plugins/npapi/webplugin_impl.cc | |
| parent | 7e044545deb5351ec1f86c3806c09a2e33cb8e62 (diff) | |
| download | chromium_src-4de4c181a016b7ff4c19a4082348799a83223615.zip chromium_src-4de4c181a016b7ff4c19a4082348799a83223615.tar.gz chromium_src-4de4c181a016b7ff4c19a4082348799a83223615.tar.bz2 | |
Revert 129458
> Keep a histogram of Flash version numbers.
>
> BUG=120634
> Review URL: https://chromiumcodereview.appspot.com/9844018
TBR=cevans@chromium.org
Review URL: https://codereview.chromium.org/12077041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi/webplugin_impl.cc')
| -rw-r--r-- | webkit/plugins/npapi/webplugin_impl.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index c9aa776..4f072e5 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -87,7 +87,6 @@ const char kOctetStreamMimeType[] = "application/octet-stream"; const char kHTMLMimeType[] = "text/html"; const char kPlainTextMimeType[] = "text/plain"; const char kPluginFlashMimeType[] = "Plugin.FlashMIMEType"; -const char kPluginFlashVersion[] = "Plugin.FlashVersion"; enum { MIME_TYPE_OK = 0, @@ -246,7 +245,6 @@ struct WebPluginImpl::ClientInfo { linked_ptr<WebKit::WebURLLoader> loader; bool notify_redirects; bool is_plugin_src_load; - bool check_flash_version; }; bool WebPluginImpl::initialize(WebPluginContainer* container) { @@ -920,14 +918,12 @@ void WebPluginImpl::didReceiveResponse(WebURLLoader* loader, // Defend against content confusion by the Flash plug-in. if (client_info->is_plugin_src_load && mime_type_ == kFlashPluginSwfMimeType) { - client_info->check_flash_version = true; std::string sniff = response.httpHeaderField("X-Content-Type-Options").utf8(); std::string content_type = response.httpHeaderField("Content-Type").utf8(); StringToLowerASCII(&sniff); StringToLowerASCII(&content_type); - // TODO(cevans): remove when we no longer need these. if (content_type.find(kFlashPluginSwfMimeType) != std::string::npos) { UMA_HISTOGRAM_ENUMERATION(kPluginFlashMimeType, MIME_TYPE_OK, @@ -1044,21 +1040,6 @@ void WebPluginImpl::didReceiveData(WebURLLoader* loader, if (!client) return; - ClientInfo* client_info = GetClientInfoFromLoader(loader); - if (client_info && client_info->check_flash_version) { - client_info->check_flash_version = false; - if (data_length >= 4 && - (buffer[0] == 'C' || buffer[1] == 'F') && - buffer[1] == 'W' && - buffer[2] == 'S') { - unsigned char version = static_cast<unsigned char>(buffer[3]); - // TODO(cevans): remove when we no longer need this. - UMA_HISTOGRAM_ENUMERATION(kPluginFlashVersion, - version, - 256); - } - } - MultiPartResponseHandlerMap::iterator index = multi_part_response_map_.find(client); if (index != multi_part_response_map_.end()) { @@ -1249,7 +1230,6 @@ bool WebPluginImpl::InitiateHTTPRequest(unsigned long resource_id, info.pending_failure_notification = false; info.notify_redirects = notify_redirects; info.is_plugin_src_load = is_plugin_src_load; - info.check_flash_version = false; if (range_info) { info.request.addHTTPHeaderField(WebString::fromUTF8("Range"), |