Keep a histogram of Flash version numbers.

webkit/plugins/npapi/webplugin_impl.cc

 // Copyright (c) 2012 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 "webkit/plugins/npapi/webplugin_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/message_loop.h"
@@ skipping 68 matching lines @@
 namespace webkit {
 namespace npapi {
 
 namespace {
 
 const char kFlashMimeType[] = "application/x-shockwave-flash";
 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,
   MIME_TYPE_EMPTY,
   MIME_TYPE_OCTETSTREAM,
   MIME_TYPE_HTML,
   MIME_TYPE_PLAINTEXT,
   MIME_TYPE_OTHER,
   MIME_TYPE_NUM_EVENTS
 };
@@ skipping 138 matching lines @@
 // WebKit::WebPlugin ----------------------------------------------------------
 
 struct WebPluginImpl::ClientInfo {
   unsigned long id;
   WebPluginResourceClient* client;
   WebKit::WebURLRequest request;
   bool pending_failure_notification;
   linked_ptr<WebKit::WebURLLoader> loader;
   bool notify_redirects;
   bool is_plugin_src_load;
+  bool check_flash_version;
 };
 
 bool WebPluginImpl::initialize(WebPluginContainer* container) {
   if (!page_delegate_) {
     LOG(ERROR) << "No page delegate";
     return false;
   }
 
   WebPluginDelegate* plugin_delegate = page_delegate_->CreatePluginDelegate(
       file_path_, mime_type_);
@@ skipping 627 matching lines @@
   ResponseInfo response_info;
   GetResponseInfo(response, &response_info);
 
   ClientInfo* client_info = GetClientInfoFromLoader(loader);
   if (!client_info)
     return;
 
   // Defend against content confusion by the Flash plug-in.
   if (client_info->is_plugin_src_load &&
       mime_type_ == kFlashMimeType) {
+    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);
     if (content_type.find(kFlashMimeType) != std::string::npos) {
       UMA_HISTOGRAM_ENUMERATION(kPluginFlashMimeType,
                                 MIME_TYPE_OK,
                                 MIME_TYPE_NUM_EVENTS);
@@ skipping 102 matching lines @@
 }
 
 void WebPluginImpl::didReceiveData(WebURLLoader* loader,
                                    const char *buffer,
                                    int data_length,
                                    int encoded_data_length) {
   WebPluginResourceClient* client = GetClientFromLoader(loader);
   if (!client)
     return;
 
+  ClientInfo* client_info = GetClientInfoFromLoader(loader);

[Bernhard Bauer, 2012/03/28 13:19:29]

Can you put this (and possibly the |check_flash_version| flag) into an #if
defined(GOOGLE_CHROME_BUILD)?

+  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]);
+      UMA_HISTOGRAM_ENUMERATION(kPluginFlashVersion,
+                                version,
+                                256);
+    }
+  }
+
   MultiPartResponseHandlerMap::iterator index =
       multi_part_response_map_.find(client);
   if (index != multi_part_response_map_.end()) {
     MultipartResponseDelegate* multi_part_handler = (*index).second;
     DCHECK(multi_part_handler != NULL);
     multi_part_handler->OnReceivedData(buffer,
                                        data_length,
                                        encoded_data_length);
   } else {
     loader->setDefersLoading(true);
@@ skipping 170 matching lines @@
   info.request.initialize();
   info.request.setURL(url);
   info.request.setFirstPartyForCookies(
       webframe_->document().firstPartyForCookies());
   info.request.setRequestorProcessID(delegate_->GetProcessId());
   info.request.setTargetType(WebURLRequest::TargetIsObject);
   info.request.setHTTPMethod(WebString::fromUTF8(method));
   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"),
                                     WebString::fromUTF8(range_info));
   }
 
   if (strcmp(method, "POST") == 0) {
     // Adds headers or form data to a request.  This must be called before
     // we initiate the actual request.
     SetPostData(&info.request, buf, buf_len);
@@ skipping 186 matching lines @@
       webframe_->setReferrerForRequest(*request, plugin_url_);
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit