Merge 62261, 62267, 62265 & 62679...

webkit/support/webkit_support.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 "webkit/support/webkit_support.h"
 
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 238 matching lines @@
                            const WebPluginParams& params) {
   const bool kAllowWildcard = true;
   WebPluginInfo info;
   std::string actual_mime_type;
   if (!NPAPI::PluginList::Singleton()->GetPluginInfo(
           params.url, params.mimeType.utf8(), kAllowWildcard, &info,
           &actual_mime_type) || !info.enabled) {
     return NULL;
   }
 
-  if (actual_mime_type.empty())
-    actual_mime_type = params.mimeType.utf8();
-
   return new WebPluginImplWithPageDelegate(
       frame, params, info.path, actual_mime_type);
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,
                                           WebMediaPlayerClient* client) {
   scoped_refptr<media::FilterFactoryCollection> factory =
       new media::FilterFactoryCollection();
 
   appcache::WebApplicationCacheHostImpl* appcache_host =
@@ skipping 260 matching lines @@
   if (!webkit_glue::GetExeDirectory(&dirExe)) {
       DCHECK(false);
       return WebURL();
   }
   FilePath devToolsPath = dirExe.AppendASCII(
       "resources/inspector/devtools.html");
   return net::FilePathToFileURL(devToolsPath);
 }
 
 }  // namespace webkit_support