Add a flag to LaunchSelLdr to skip grabbing a routing_id.

chrome/renderer/pepper/ppb_nacl_private_impl.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 "chrome/renderer/pepper/ppb_nacl_private_impl.h"
 
 #ifndef DISABLE_NACL
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 39 matching lines @@
 };
 
 typedef std::map<PP_Instance, InstanceInfo> InstanceInfoMap;
 
 base::LazyInstance<InstanceInfoMap> g_instance_info =
     LAZY_INSTANCE_INITIALIZER;
 
 // Launch NaCl's sel_ldr process.
 PP_NaClResult LaunchSelLdr(PP_Instance instance,
                            const char* alleged_url,
+                           PP_Bool uses_ppapi,
                            PP_Bool enable_ppapi_dev,
                            int socket_count,
                            void* imc_handles) {
   std::vector<nacl::FileDescriptor> sockets;
   IPC::Sender* sender = content::RenderThread::Get();
   if (sender == NULL)
     sender = g_background_thread_sender.Pointer()->get();
 
-  webkit::ppapi::PluginInstance* plugin_instance =
-      content::GetHostGlobals()->GetInstance(instance);
-  if (!plugin_instance)
-    return PP_NACL_FAILED;
+  int routing_id = 0;
+  // If the nexe uses ppapi APIs, we need a routing ID.
+  // To get the routing ID, we must be on the main thread.
+  // Some nexes do not use ppapi and launch from the background thread,
+  // so those nexes can skip finding a routing_id.
+  if (uses_ppapi) {
+    webkit::ppapi::PluginInstance* plugin_instance =

[brettw, 2012/11/29 04:57:18]

Can you add an assertion at the top here that content::RenderThread::Get() is
non-NULL (we should be on the render thread).

[jvoung (off chromium), 2012/11/29 22:46:46]

Done.

+        content::GetHostGlobals()->GetInstance(instance);
+    if (!plugin_instance)
+      return PP_NACL_FAILED;
 
-  WebKit::WebView* web_view =
-      plugin_instance->container()->element().document().frame()->view();
-  content::RenderView* render_view =
-      content::RenderView::FromWebView(web_view);
-  if (!render_view)
-    return PP_NACL_FAILED;
+    WebKit::WebView* web_view =
+        plugin_instance->container()->element().document().frame()->view();
+    content::RenderView* render_view =
+        content::RenderView::FromWebView(web_view);
+    if (!render_view)
+      return PP_NACL_FAILED;
+    routing_id = render_view->GetRoutingID();
+  }
 
   InstanceInfo instance_info;
   instance_info.url = GURL(alleged_url);
 
   uint32_t perm_bits = ppapi::PERMISSION_NONE;
   // Conditionally block 'Dev' interfaces. We do this for the NaCl process, so
   // it's clearer to developers when they are using 'Dev' inappropriately. We
   // must also check on the trusted side of the proxy.
   // TODO(bbudge) verify we're blocking 'Dev' interfaces on the trusted side.
   if (enable_ppapi_dev)
     perm_bits |= ppapi::PERMISSION_DEV;
   instance_info.permissions = ppapi::PpapiPermissions(perm_bits);
 
   if (!sender->Send(new ChromeViewHostMsg_LaunchNaCl(
           instance_info.url,
-          render_view->GetRoutingID(),
+          routing_id,
           perm_bits,
           socket_count, &sockets,
           &instance_info.channel_handle,
           &instance_info.plugin_child_id))) {
     return PP_NACL_FAILED;
   }
 
   // Don't save instance_info if channel handle is invalid.
   bool invalid_handle = instance_info.channel_handle.name.empty();
 #if defined(OS_POSIX)
@@ skipping 149 matching lines @@
   &IsPnaclEnabled
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() {
   return &nacl_interface;
 }
 
 #endif  // DISABLE_NACL