Pepper: Whitelist dev channel APIs for some apps.

components/nacl/renderer/ppb_nacl_private_impl.cc

 // Copyright 2013 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 "components/nacl/renderer/ppb_nacl_private_impl.h"
 
 #include <numeric>
 #include <string>
 #include <vector>
 
@@ skipping 275 matching lines @@
     routing_id = GetRoutingID(instance);
     if (!routing_id) {
       ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
           FROM_HERE,
           base::Bind(callback.func, callback.user_data,
                      static_cast<int32_t>(PP_ERROR_FAILED)));
       return;
     }
   }
 
+  // If the nexe uses ppapi APIs, we have to send the document URL to the
+  // browser side when launching the host. This is so that whitelisting can be
+  // performed for specific application IDs.
+  std::string document_url_string;
+  if (uses_ppapi) {
+    content::RendererPpapiHost *host =
+      content::RendererPpapiHost::GetForPPInstance(instance);
+    if (!host) {
+      ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
+          FROM_HERE,
+          base::Bind(callback.func, callback.user_data,
+                     static_cast<int32_t>(PP_ERROR_FAILED)));

[dmichael (off chromium), 2014/06/13 21:07:26]

suggestion: Looks like you could use PostPPCompletionCallback like below.

[teravest, 2014/06/13 21:13:00]

Done.

+      return;
+    }
+    document_url_string = host->GetDocumentURL(instance).spec();
+  }
+
   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.
   if (enable_ppapi_dev)
     perm_bits |= ppapi::PERMISSION_DEV;
   instance_info.permissions =
       ppapi::PpapiPermissions::GetForCommandLine(perm_bits);
   std::string error_message_string;
   NaClLaunchResult launch_result;
 
   if (!sender->Send(new NaClHostMsg_LaunchNaCl(
-          NaClLaunchParams(instance_info.url.spec(),
+          NaClLaunchParams(document_url_string,
+                           instance_info.url.spec(),
                            routing_id,
                            perm_bits,
                            PP_ToBool(uses_irt),
                            PP_ToBool(uses_nonsfi_mode),
                            PP_ToBool(enable_dyncode_syscalls),
                            PP_ToBool(enable_exception_handling),
                            PP_ToBool(enable_crash_throttling)),
           &launch_result,
           &error_message_string))) {
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
@@ skipping 1219 matching lines @@
   &ReportSelLdrStatus
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl