Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1592)

Unified Diff: chrome/renderer/extensions/dispatcher.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/extensions/dispatcher.h ('k') | chrome/renderer/media/cast_session_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/dispatcher.cc
===================================================================
--- chrome/renderer/extensions/dispatcher.cc (revision 257432)
+++ chrome/renderer/extensions/dispatcher.cc (working copy)
@@ -519,7 +519,8 @@
// For extensions, we want to ensure we call the IdleHandler every so often,
// even if the extension keeps up activity.
if (is_extension_process_) {
- forced_idle_timer_.Start(FROM_HERE,
+ forced_idle_timer_.reset(new base::RepeatingTimer<content::RenderThread>);
+ forced_idle_timer_->Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kMaxExtensionIdleHandlerDelayMs),
RenderThread::Get(), &RenderThread::IdleHandler);
}
@@ -544,8 +545,8 @@
int64 forced_delay_ms = std::max(
RenderThread::Get()->GetIdleNotificationDelayInMs(),
kMaxExtensionIdleHandlerDelayMs);
- forced_idle_timer_.Stop();
- forced_idle_timer_.Start(FROM_HERE,
+ forced_idle_timer_->Stop();
+ forced_idle_timer_->Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(forced_delay_ms),
RenderThread::Get(), &RenderThread::IdleHandler);
}
@@ -553,6 +554,7 @@
void Dispatcher::OnRenderProcessShutdown() {
v8_schema_registry_.reset();
+ forced_idle_timer_.reset();
}
void Dispatcher::OnSetFunctionNames(
« no previous file with comments | « chrome/renderer/extensions/dispatcher.h ('k') | chrome/renderer/media/cast_session_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698