Replace --ppapi-keep-alive-throttle command line switch with IPC parameter.

ppapi/proxy/plugin_main_irt.cc

 // Copyright 2014 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/plugin_main_irt.h"
 
 #include <unistd.h>
 #include <map>
 #include <set>
 
@@ skipping 14 matching lines @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_message_filter.h"
 #include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/resource_reply_thread_registrar.h"
-#include "ppapi/shared_impl/ppapi_switches.h"
 #include "ppapi/shared_impl/ppb_audio_shared.h"
 
 #if defined(__native_client__)
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #endif
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 #include "base/containers/hash_tables.h"
 
@@ skipping 63 matching lines @@
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   // IPC::Sender implementation
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
  private:
   void OnMsgInitializeNaClDispatcher(const ppapi::PpapiNaClPluginArgs& args);
   void OnPluginDispatcherMessageReceived(const IPC::Message& msg);
 
-  void SetPpapiKeepAliveThrottleFromCommandLine();
-
   std::set<PP_Instance> instances_;
   std::map<uint32, PluginDispatcher*> plugin_dispatchers_;
   uint32 next_plugin_dispatcher_id_;
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WaitableEvent shutdown_event_;
   scoped_ptr<IPC::SyncChannel> channel_;
 };
 
 PpapiDispatcher::PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop)
     : next_plugin_dispatcher_id_(0),
@@ skipping 111 matching lines @@
   command_line_and_logging_initialized = true;
   CommandLine::Init(0, NULL);
   for (size_t i = 0; i < args.switch_names.size(); ++i) {
     DCHECK(i < args.switch_values.size());
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         args.switch_names[i], args.switch_values[i]);
   }
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
-  SetPpapiKeepAliveThrottleFromCommandLine();
+
+  ppapi::proxy::PluginGlobals::Get()
+      ->set_keepalive_throttle_interval_milliseconds(
+          args.keepalive_throttle_interval_milliseconds);
 
   // Tell the process-global GetInterface which interfaces it can return to the
   // plugin.
   ppapi::proxy::InterfaceList::SetProcessGlobalPermissions(
       args.permissions);
 
   int32_t error = ::PPP_InitializeModule(
       0 /* module */,
       &ppapi::proxy::PluginDispatcher::GetBrowserInterface);
   if (error)
@@ skipping 24 matching lines @@
   if (!msg.ReadUInt32(&iter, &id)) {
     NOTREACHED();
     return;
   }
   std::map<uint32, ppapi::proxy::PluginDispatcher*>::iterator dispatcher =
       plugin_dispatchers_.find(id);
   if (dispatcher != plugin_dispatchers_.end())
     dispatcher->second->OnMessageReceived(msg);
 }
 
-void PpapiDispatcher::SetPpapiKeepAliveThrottleFromCommandLine() {
-  unsigned keepalive_throttle_interval_milliseconds = 0;
-  if (base::StringToUint(
-          CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-              switches::kPpapiKeepAliveThrottle),
-          &keepalive_throttle_interval_milliseconds)) {
-    ppapi::proxy::PluginGlobals::Get()->
-        set_keepalive_throttle_interval_milliseconds(
-            keepalive_throttle_interval_milliseconds);
-  }
-}
-
 }  // namespace
 
 void SetIPCFileDescriptors(int ipc_browser_fd, int ipc_renderer_fd) {
   g_nacl_ipc_browser_fd = ipc_browser_fd;
   g_nacl_ipc_renderer_fd = ipc_renderer_fd;
 }
 
 void PpapiPluginRegisterThreadCreator(
     const struct PP_ThreadFunctions* thread_functions) {
 #if defined(__native_client__)
@@ skipping 34 matching lines @@
   }
 #endif
 
   PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy());
   plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher);
 
   loop.Run();
 
   return 0;
 }