Relanding the following revisions....

webkit/activex_shim/activex_shared.h

 // Copyright (c) 2006-2008 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.
 //
 // Thes file contains stuff that should be shared among projects that do some
 // special handling with ActiveX.
 
 #ifndef WEBKIT_ACTIVEX_SHIM_ACTIVEX_SHARED_H__
 #define WEBKIT_ACTIVEX_SHIM_ACTIVEX_SHARED_H__
 
@@ skipping 43 matching lines @@
 // If an ActiveX control is allowed to run from a specific URL.
 bool IsActiveXAllowed(const std::string& clsid, const GURL& url);
 
 // If an ActiveX control's codebase comes from allowed websites.
 bool IsCodebaseAllowed(const std::string& clsid, const std::string& codebase);
 
 // Check If a given mimetype is of "application/x-oleobject" or
 // "application/oleobject"
 bool IsMimeTypeActiveX(const std::string& mimetype);
 
+// Returns the NPAPI mime type for the CLSID passed in. On failure
+// return false
+bool GetMimeTypeForClsid(const std::string& clsid, std::string* mime_type);
+
 }  // namespace activex_shim
 
 #endif // #ifndef WEBKIT_ACTIVEX_SHIM_ACTIVEX_SHARED_H__