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

ppapi/proxy/plugin_globals.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 "ppapi/proxy/plugin_globals.h"
 
 #include "base/task_runner.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_message_loop_proxy.h"
 #include "ppapi/proxy/resource_reply_thread_registrar.h"
-#include "ppapi/shared_impl/ppapi_constants.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/thunk/enter.h"
 
+namespace {
+
+const int kKeepaliveThrottleIntervalDefault = 5000;
+
+}  // namespace
+
 namespace ppapi {
 namespace proxy {
 
 // It performs necessary locking/unlocking of the proxy lock, and forwards all
 // messages to the underlying sender.
 class PluginGlobals::BrowserSender : public IPC::Sender {
  public:
   // |underlying_sender| must outlive this object.
   explicit BrowserSender(IPC::Sender* underlying_sender)
       : underlying_sender_(underlying_sender) {
@@ skipping 22 matching lines @@
 PluginGlobals* PluginGlobals::plugin_globals_ = NULL;
 
 PluginGlobals::PluginGlobals()
     : ppapi::PpapiGlobals(),
       plugin_proxy_delegate_(NULL),
       callback_tracker_(new CallbackTracker),
       resource_reply_thread_registrar_(
           new ResourceReplyThreadRegistrar(GetMainThreadMessageLoop())),
       plugin_recently_active_(false),
       keepalive_throttle_interval_milliseconds_(
-          ppapi::kKeepaliveThrottleIntervalDefaultMilliseconds),
+          kKeepaliveThrottleIntervalDefault),
       weak_factory_(this) {
   DCHECK(!plugin_globals_);
   plugin_globals_ = this;
 
   // ResourceTracker asserts that we have the lock when we add new resources,
   // so we lock when creating the MessageLoopResource even though there is no
   // chance of race conditions.
   ProxyAutoLock lock;
   loop_for_main_thread_ =
       new MessageLoopResource(MessageLoopResource::ForMainThread());
 }
 
 PluginGlobals::PluginGlobals(PerThreadForTest per_thread_for_test)
     : ppapi::PpapiGlobals(per_thread_for_test),
       plugin_proxy_delegate_(NULL),
       callback_tracker_(new CallbackTracker),
       resource_reply_thread_registrar_(
           new ResourceReplyThreadRegistrar(GetMainThreadMessageLoop())),
       plugin_recently_active_(false),
       keepalive_throttle_interval_milliseconds_(
-          kKeepaliveThrottleIntervalDefaultMilliseconds),
+          kKeepaliveThrottleIntervalDefault),
       weak_factory_(this) {
   DCHECK(!plugin_globals_);
 }
 
 PluginGlobals::~PluginGlobals() {
   DCHECK(plugin_globals_ == this || !plugin_globals_);
   {
     ProxyAutoLock lock;
     // Release the main-thread message loop. We should have the last reference
     // count, so this will delete the MessageLoop resource. We do this before
@@ skipping 80 matching lines @@
   }
   return file_thread_->message_loop_proxy();
 }
 
 void PluginGlobals::MarkPluginIsActive() {
   if (!plugin_recently_active_) {
     plugin_recently_active_ = true;
     if (!GetBrowserSender() || !base::MessageLoop::current())
       return;
     GetBrowserSender()->Send(new PpapiHostMsg_Keepalive());
-    DCHECK(keepalive_throttle_interval_milliseconds_);
-    GetMainThreadMessageLoop()->PostDelayedTask(
-        FROM_HERE,
+
+    GetMainThreadMessageLoop()->PostDelayedTask(FROM_HERE,
         RunWhileLocked(base::Bind(&PluginGlobals::OnReleaseKeepaliveThrottle,
                                   weak_factory_.GetWeakPtr())),
         base::TimeDelta::FromMilliseconds(
-            keepalive_throttle_interval_milliseconds_));
+            keepalive_throttle_interval_milliseconds()));
   }
 }
 
 IPC::Sender* PluginGlobals::GetBrowserSender() {
   if (!browser_sender_.get()) {
     browser_sender_.reset(
         new BrowserSender(plugin_proxy_delegate_->GetBrowserSender()));
   }
 
   return browser_sender_.get();
@@ skipping 13 matching lines @@
     const PP_BrowserFont_Trusted_Description& desc,
     const ppapi::Preferences& prefs) {
   return plugin_proxy_delegate_->CreateBrowserFont(
       connection, instance, desc, prefs);
 }
 
 MessageLoopResource* PluginGlobals::loop_for_main_thread() {
   return loop_for_main_thread_.get();
 }
 
-void PluginGlobals::set_keepalive_throttle_interval_milliseconds(unsigned i) {
+int PluginGlobals::keepalive_throttle_interval_milliseconds() const {
+  return keepalive_throttle_interval_milliseconds_;
+}
+
+void PluginGlobals::set_keepalive_throttle_interval_milliseconds(int i) {
   keepalive_throttle_interval_milliseconds_ = i;
 }
 
 bool PluginGlobals::IsPluginGlobals() const {
   return true;
 }
 
 void PluginGlobals::OnReleaseKeepaliveThrottle() {
   ppapi::ProxyLock::AssertAcquiredDebugOnly();
   plugin_recently_active_ = false;
 }
 
 }  // namespace proxy
 }  // namespace ppapi