Take out the activex control.

webkit/tools/test_shell/test_webview_delegate_gtk.cc

Index: webkit/tools/test_shell/test_webview_delegate_gtk.cc
===================================================================
--- webkit/tools/test_shell/test_webview_delegate_gtk.cc	(revision 25626)
+++ webkit/tools/test_shell/test_webview_delegate_gtk.cc	(working copy)
@@ -199,14 +199,13 @@
 webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     const GURL& url,
     const std::string& mime_type,
-    const std::string& clsid,
     std::string* actual_mime_type) {
   bool allow_wildcard = true;
   WebPluginInfo info;
-  if (!NPAPI::PluginList::Singleton()->GetPluginInfo(url, mime_type, clsid,
-                                                     allow_wildcard, &info,
-                                                     actual_mime_type))
+  if (!NPAPI::PluginList::Singleton()->GetPluginInfo(
+          url, mime_type, allow_wildcard, &info, actual_mime_type)) {
     return NULL;
+  }
 
   const std::string& mtype =
       (actual_mime_type && !actual_mime_type->empty()) ? *actual_mime_type