Merge 62261, 62267, 62265 & 62679...

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 684 matching lines @@
 
 // WebFrameClient ------------------------------------------------------------
 
 WebPlugin* TestWebViewDelegate::createPlugin(
     WebFrame* frame, const WebPluginParams& params) {
   bool allow_wildcard = true;
   WebPluginInfo info;
   std::string actual_mime_type;
   if (!NPAPI::PluginList::Singleton()->GetPluginInfo(
           params.url, params.mimeType.utf8(), allow_wildcard, &info,
-          &actual_mime_type) || !info.enabled) {
+          &actual_mime_type) || !info.enabled)
     return NULL;
-  }
-
-  if (actual_mime_type.empty())
-    actual_mime_type = params.mimeType.utf8();
 
   return new webkit_glue::WebPluginImpl(
       frame, params, info.path, actual_mime_type, AsWeakPtr());
 }
 
 WebWorker* TestWebViewDelegate::createWorker(
     WebFrame* frame, WebWorkerClient* client) {
   return new TestWebWorker();
 }
 
@@ skipping 626 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }