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

Unified Diff: extensions/browser/process_manager.cc

Issue 112663007: Test Keeping NaCl plugins used in app background pages alive when active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix callbacks keeping reference to message loop Created 6 years, 12 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
Index: extensions/browser/process_manager.cc
diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc
index 7a362e329a387c7b90e8b3776fc65accb7e26723..070cbd78d4c6d957f5c0d3b326709009450b6ce5 100644
--- a/extensions/browser/process_manager.cc
+++ b/extensions/browser/process_manager.cc
@@ -442,6 +442,11 @@ void ProcessManager::KeepaliveImpulse(const Extension* extension) {
IncrementLazyKeepaliveCount(extension);
}
}
+
+ if (!keepalive_impulse_callback_for_testing_.is_null()) {
+ if (keepalive_impulse_callback_for_testing_.Run(extension->id()))
+ keepalive_impulse_callback_for_testing_ = ImpulseCallbackForTesting();
+ }
}
// DecrementLazyKeepaliveCount is called when no calls to KeepaliveImpulse
@@ -454,8 +459,14 @@ void ProcessManager::OnKeepaliveImpulseCheck() {
for (BackgroundPageDataMap::iterator i = background_page_data_.begin();
i != background_page_data_.end();
++i) {
- if (i->second.previous_keepalive_impulse && !i->second.keepalive_impulse)
+ if (i->second.previous_keepalive_impulse && !i->second.keepalive_impulse) {
DecrementLazyKeepaliveCount(i->first);
+ if (!keepalive_impulse_decrement_callback_for_testing_.is_null()) {
+ if (keepalive_impulse_decrement_callback_for_testing_.Run(i->first))
+ keepalive_impulse_decrement_callback_for_testing_ =
+ ImpulseCallbackForTesting();
+ }
+ }
i->second.previous_keepalive_impulse = i->second.keepalive_impulse;
i->second.keepalive_impulse = false;
@@ -576,6 +587,16 @@ content::BrowserContext* ProcessManager::GetBrowserContext() const {
return site_instance_->GetBrowserContext();
}
+void ProcessManager::SetKeepaliveImpulseCallbackForTesting(
+ const ImpulseCallbackForTesting& callback) {
+ keepalive_impulse_callback_for_testing_ = callback;
+}
+
+void ProcessManager::SetKeepaliveImpulseDecrementCallbackForTesting(
+ const ImpulseCallbackForTesting& callback) {
+ keepalive_impulse_decrement_callback_for_testing_ = callback;
+}
+
void ProcessManager::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {

Powered by Google App Engine
This is Rietveld 408576698