Superset of Nacl Keepalive patch & tests - NOT FOR LANDING DIRECTLY.

components/nacl/browser/nacl_process_host.cc

Index: components/nacl/browser/nacl_process_host.cc
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 2d154f38d986a846756618da10884de75f8dd870..6de1dbe6ae7f06b62a6537e6c9481223f7051440 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -49,6 +49,7 @@
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h"
+#include "ppapi/shared_impl/ppapi_switches.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
@@ -799,6 +800,8 @@ void NaClProcessHost::OnPpapiChannelCreated(
         nacl_host_message_filter_->render_process_id(),
         render_view_id_,
         profile_directory_));
+    ppapi_host_->SetOnKeepaliveCallback(
+        NaClBrowser::GetDelegate()->GetOnKeepaliveCallback());
 
     ppapi::PpapiNaClChannelArgs args;
     args.off_the_record = nacl_host_message_filter_->off_the_record();
@@ -807,7 +810,11 @@ void NaClProcessHost::OnPpapiChannelCreated(
         content::PluginService::GetInstance()->PpapiDevChannelSupported();
     CommandLine* cmdline = CommandLine::ForCurrentProcess();
     DCHECK(cmdline);
-    std::string flag_whitelist[] = {switches::kV, switches::kVModule};
+    std::string flag_whitelist[] = {
+      switches::kPpapiKeepAliveThrottle,
+      switches::kV,
+      switches::kVModule,
+    };
     for (size_t i = 0; i < arraysize(flag_whitelist); ++i) {
       std::string value = cmdline->GetSwitchValueASCII(flag_whitelist[i]);
       if (!value.empty()) {