Removal Of NPObjectProxy ClassId

plugin/npapi_host_control/win/np_browser_proxy.cc

 // Copyright 2009, Google Inc.  All rights reserved.
 // Portions of this file were adapted from the Mozilla project.
 // See https://developer.mozilla.org/en/ActiveX_Control_for_Hosting_Netscape_Plug-ins_in_IE
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 141 matching lines @@
       CComPtr<IDispatchEx> dispatch_ex(NULL);
       HRESULT hr = it->second.QueryInterface(&dispatch_ex);
       if (SUCCEEDED(hr)) {
         return dispatch_ex;
       } else {
         return NULL;
       }
     }
 
     // Create a new NPObject proxy, register it for future use and return it.
+    CComObject<NPObjectProxy>* proxy_instance;
+    HRESULT hr = CComObject<NPObjectProxy>::CreateInstance(&proxy_instance);
+    if (FAILED(hr))
+      return NULL;
+
     CComPtr<INPObjectProxy> proxy_wrapper;
-    HRESULT hr = NPObjectProxy::CreateInstance(&proxy_wrapper);
+    hr = proxy_instance->QueryInterface(&proxy_wrapper);
     if (SUCCEEDED(hr)) {
       proxy_wrapper->SetBrowserProxy(this);
       proxy_wrapper->SetHostedObject(np_object);
       RegisterNPObjectProxy(np_object, proxy_wrapper);
 
       CComPtr<IDispatchEx> dispatch_proxy_wrapper;
       hr = proxy_wrapper.QueryInterface(&dispatch_proxy_wrapper);
       ATLASSERT(SUCCEEDED(hr));
       return dispatch_proxy_wrapper;
     }
@@ skipping 646 matching lines @@
   // All NPObjectProxy instances stored in the java-script environment must
   // be marked so that scripted operations on these operations fail after
   // the plug-in has been torn down.  We release the hosted object on all of
   // these wrappers to prevent access, and allow deletion of the NPAPI objects.
   NPObjectProxyMap::iterator np_object_iter(np_object_proxy_map_.begin()),
       np_object_end(np_object_proxy_map_.end());
   for (; np_object_iter != np_object_end; ++np_object_iter) {
     np_object_iter->second->ReleaseHosted();
   }
 }