Merge 62261, 62267, 62265 & 62679...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 4048 matching lines @@
                                           const FilePath& path,
                                           pepper::PluginModule* pepper_module) {
   return new pepper::WebPluginImpl(
       pepper_module, params, pepper_delegate_.AsWeakPtr());
 }
 
 WebPlugin* RenderView::CreateNPAPIPlugin(WebFrame* frame,
                                          const WebPluginParams& params,
                                          const FilePath& path,
                                          const std::string& mime_type) {
-  std::string actual_mime_type(mime_type);
-  if (actual_mime_type.empty())
-    actual_mime_type = params.mimeType.utf8();
-
-  return new webkit_glue::WebPluginImpl(frame, params, path,
-                                        actual_mime_type, AsWeakPtr());
+  return new webkit_glue::WebPluginImpl(
+      frame, params, path, mime_type, AsWeakPtr());
 }
 
 WebPlugin* RenderView::CreateOutdatedPluginPlaceholder(
     WebFrame* frame,
     const WebPluginParams& params,
     PluginGroup* group) {
   int resource_id = IDR_OUTDATED_PLUGIN_HTML;
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
 
@@ skipping 1908 matching lines @@
 }
 
 void RenderView::OnAsyncFileOpened(base::PlatformFileError error_code,
                                    IPC::PlatformFileForTransit file_for_transit,
                                    int message_id) {
   pepper_delegate_.OnAsyncFileOpened(
       error_code,
       IPC::PlatformFileForTransitToPlatformFile(file_for_transit),
       message_id);
 }