diff options
author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 02:38:51 +0000 |
---|---|---|
committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 02:38:51 +0000 |
commit | 4f67d17c879cc6fac85f5baeb82115e5a5ca169f (patch) | |
tree | 3205b017b12f171eeb6563cdec4539d7570b8bbf /content/plugin/plugin_channel.cc | |
parent | 14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b (diff) | |
download | chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.zip chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.tar.gz chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.tar.bz2 |
Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.
This change broke Linux and Mac bots. I would recommend to ask committers to run your next change on trybots.
(*1) http://chromegw.corp.google.com/i/chromium/builders/Mac/builds/10788/steps/compile/logs/stdio
(*2) http://chromegw.corp.google.com/i/chromium/builders/Linux/builds/19313/steps/compile/logs/stdio
(*3) http://chromegw.corp.google.com/i/chromium/builders/Linux%20x64/builds/21385/steps/compile/logs/stdio
R=brettw@chromium.org
BUG=108171
TEST=
Review URL: http://codereview.chromium.org/9185026
TBR=tedvessenes@gmail.com
Review URL: http://codereview.chromium.org/9215005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/plugin_channel.cc')
-rw-r--r-- | content/plugin/plugin_channel.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index 56bdf47..a410af7 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -31,7 +31,7 @@ void PluginReleaseCallback() { } // How long we wait before releasing the plugin process. -const int kPluginReleaseTimeMinutes = 5; +const int kPluginReleaseTimeMs = 5 * 60 * 1000; // 5 minutes } // namespace @@ -177,9 +177,7 @@ PluginChannel::~PluginChannel() { base::CloseProcessHandle(renderer_handle_); MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::Bind(&PluginReleaseCallback), - base::TimeDelta::FromMinutes(kPluginReleaseTimeMinutes)); + FROM_HERE, base::Bind(&PluginReleaseCallback), kPluginReleaseTimeMs); } bool PluginChannel::Send(IPC::Message* msg) { |