Pepper: Add routing ID information to Connection.

content/renderer/pepper/pepper_in_process_resource_creation.cc

Index: content/renderer/pepper/pepper_in_process_resource_creation.cc
diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.cc b/content/renderer/pepper/pepper_in_process_resource_creation.cc
index d5c70308da44f886a98c1ba1d96c93d5f2adc75e..bcb7eb51354e1d2a85cd21d3afb5042f0976ef85 100644
--- a/content/renderer/pepper/pepper_in_process_resource_creation.cc
+++ b/content/renderer/pepper/pepper_in_process_resource_creation.cc
@@ -59,7 +59,7 @@ PP_Resource PepperInProcessResourceCreation::CreateBrowserFont(
   ppapi::Preferences prefs(
       host_impl_->GetRenderViewForInstance(instance)->GetWebkitPreferences());
   return (new ppapi::proxy::BrowserFontResource_Trusted(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance,
       *description,
       prefs))->GetReference();
@@ -73,7 +73,7 @@ PP_Resource PepperInProcessResourceCreation::CreateFileChooser(
       ppapi::StringVar::FromPPVar(accept_types);
   std::string str = string_var.get() ? string_var->value() : std::string();
   return (new ppapi::proxy::FileChooserResource(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance,
       mode,
       str.c_str()))->GetReference();
@@ -82,7 +82,7 @@ PP_Resource PepperInProcessResourceCreation::CreateFileChooser(
 PP_Resource PepperInProcessResourceCreation::CreateFileIO(
     PP_Instance instance) {
   return (new ppapi::proxy::FileIOResource(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance))->GetReference();
 }
 
@@ -90,7 +90,7 @@ PP_Resource PepperInProcessResourceCreation::CreateFileSystem(
     PP_Instance instance,
     PP_FileSystemType type) {
   return (new ppapi::proxy::FileSystemResource(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance, type))->GetReference();
 }
 
@@ -99,14 +99,14 @@ PP_Resource PepperInProcessResourceCreation::CreateGraphics2D(
     const PP_Size* size,
     PP_Bool is_always_opaque) {
   return (new ppapi::proxy::Graphics2DResource(
-          host_impl_->in_process_router()->GetPluginConnection(),
+          host_impl_->in_process_router()->GetPluginConnection(instance),
           instance, *size, is_always_opaque))->GetReference();
 }
 
 PP_Resource PepperInProcessResourceCreation::CreatePrinting(
     PP_Instance instance) {
   return (new ppapi::proxy::PrintingResource(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance))->GetReference();
 }
 
@@ -120,21 +120,21 @@ PP_Resource PepperInProcessResourceCreation::CreateTrueTypeFont(
 PP_Resource PepperInProcessResourceCreation::CreateURLLoader(
     PP_Instance instance) {
   return (new ppapi::proxy::URLLoaderResource(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance))->GetReference();
 }
 
 PP_Resource PepperInProcessResourceCreation::CreateURLRequestInfo(
     PP_Instance instance) {
   return (new ppapi::proxy::URLRequestInfoResource(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance, ::ppapi::URLRequestInfoData()))->GetReference();
 }
 
 PP_Resource PepperInProcessResourceCreation::CreateWebSocket(
     PP_Instance instance) {
   return (new ppapi::proxy::WebSocketResource(
-      host_impl_->in_process_router()->GetPluginConnection(),
+      host_impl_->in_process_router()->GetPluginConnection(instance),
       instance))->GetReference();
 }