Merge 248007 "Expand the QuickTime quirk to handle all mime type..."

content/child/npapi/webplugin_delegate_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 "content/child/npapi/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 34 matching lines @@
   } else {
     delete this;
   }
 }
 
 bool WebPluginDelegateImpl::Initialize(
     const GURL& url,
     const std::vector<std::string>& arg_names,
     const std::vector<std::string>& arg_values,
     bool load_manually) {
-  if (instance_->mime_type() == "video/quicktime")
+  if (instance_->plugin_lib()->plugin_info().name.find(
+          base::ASCIIToUTF16("QuickTime Plug-in")) != std::wstring::npos) {
     quirks_ |= PLUGIN_QUIRK_COPY_STREAM_DATA;
+  }
 
   instance_->set_web_plugin(plugin_);
   if (quirks_ & PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES) {
     PluginLib* plugin_lib = instance()->plugin_lib();
     if (plugin_lib->instance_count() > 1) {
       return false;
     }
   }
 
   int argc = 0;
@@ skipping 254 matching lines @@
       resource_id, url, std::string(), notify_id);
 
   bool copy_stream_data = !!(quirks_ & PLUGIN_QUIRK_COPY_STREAM_DATA);
   plugin_stream->SetPluginURLFetcher(new PluginURLFetcher(
       plugin_stream, url, first_party_for_cookies, method, buf, len,
       referrer, notify_redirects, is_plugin_src_load, origin_pid,
       render_view_id, resource_id, copy_stream_data));
 }
 
 }  // namespace content