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/ppapi_plugin | |
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/ppapi_plugin')
-rw-r--r-- | content/ppapi_plugin/broker_process_dispatcher.cc | 6 | ||||
-rw-r--r-- | content/ppapi_plugin/plugin_process_dispatcher.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc index 7cdc0e34..6fce803 100644 --- a/content/ppapi_plugin/broker_process_dispatcher.cc +++ b/content/ppapi_plugin/broker_process_dispatcher.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. @@ -11,7 +11,7 @@ namespace { // How long we wait before releasing the broker process. -const int kBrokerReleaseTimeSeconds = 30; +const int kBrokerReleaseTimeMs = 30 * 1000; // 30 seconds. } // namespace @@ -34,5 +34,5 @@ BrokerProcessDispatcher::~BrokerProcessDispatcher() { FROM_HERE, base::Bind(&ChildProcess::ReleaseProcess, base::Unretained(ChildProcess::current())), - base::TimeDelta::FromSeconds(kBrokerReleaseTimeSeconds)); + kBrokerReleaseTimeMs); } diff --git a/content/ppapi_plugin/plugin_process_dispatcher.cc b/content/ppapi_plugin/plugin_process_dispatcher.cc index 5d33e12..1ac23d1 100644 --- a/content/ppapi_plugin/plugin_process_dispatcher.cc +++ b/content/ppapi_plugin/plugin_process_dispatcher.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. @@ -11,7 +11,7 @@ namespace { // How long we wait before releasing the plugin process. -const int kPluginReleaseTimeSeconds = 30; +const int kPluginReleaseTimeMs = 30 * 1000; // 30 seconds. } // namespace @@ -32,5 +32,5 @@ PluginProcessDispatcher::~PluginProcessDispatcher() { FROM_HERE, base::Bind(&ChildProcess::ReleaseProcess, base::Unretained(ChildProcess::current())), - base::TimeDelta::FromSeconds(kPluginReleaseTimeSeconds)); + kPluginReleaseTimeMs); } |