PPAPI/NaCl: Reinitialize some stuff when the ipc proxy starts.

ppapi/proxy/ppp_instance_proxy.cc

 // Copyright (c) 2012 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 "ppapi/proxy/ppp_instance_proxy.h"
 
 #include <algorithm>
 
+#include "base/bind.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_fullscreen.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/private/ppb_flash_fullscreen.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_url_loader_proxy.h"
@@ skipping 118 matching lines @@
   if (dispatcher->IsPlugin()) {
     // The PPP_Instance proxy works by always proxying the 1.1 version of the
     // interface, and then detecting in the plugin process which one to use.
     // PPP_Instance_Combined handles dispatching to whatever interface is
     // supported.
     //
     // This means that if the plugin supports either 1.0 or 1.1 version of
     // the interface, we want to say it supports the 1.1 version since we'll
     // convert it here. This magic conversion code is hardcoded into
     // PluginDispatcher::OnMsgSupportsInterface.
-    const PPP_Instance* instance = static_cast<const PPP_Instance*>(
-        dispatcher->local_get_interface()(PPP_INSTANCE_INTERFACE));
-    if (instance) {
-      combined_interface_.reset(new PPP_Instance_Combined(*instance));
-    } else {
-      const PPP_Instance_1_0* instance_1_0 =
-          static_cast<const PPP_Instance_1_0*>(
-              dispatcher->local_get_interface()(PPP_INSTANCE_INTERFACE_1_0));
-      combined_interface_.reset(new PPP_Instance_Combined(*instance_1_0));
-    }
+    combined_interface_.reset(PPP_Instance_Combined::Create(
+        base::Bind(dispatcher->local_get_interface())));
   }
 }
 
 PPP_Instance_Proxy::~PPP_Instance_Proxy() {
 }
 
 // static
 const PPP_Instance* PPP_Instance_Proxy::GetInstanceInterface() {
   return &instance_interface;
 }
@@ skipping 97 matching lines @@
   // with. The plugin will normally take an additional reference which will keep
   // the resource alive in the plugin (and the one reference in the renderer
   // representing all plugin references).
   // Once all references at the plugin side are released, the renderer side will
   // be notified and release the reference added in HandleDocumentLoad() above.
   PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(plugin_loader);
 }
 
 }  // namespace proxy
 }  // namespace ppapi