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

Unified Diff: trunk/src/extensions/browser/process_manager.cc

Issue 118533004: Revert 242061 "Test Keeping NaCl plugins used in app background ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 | « trunk/src/extensions/browser/process_manager.h ('k') | trunk/src/ppapi/proxy/plugin_main_nacl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/extensions/browser/process_manager.cc
===================================================================
--- trunk/src/extensions/browser/process_manager.cc (revision 242118)
+++ trunk/src/extensions/browser/process_manager.cc (working copy)
@@ -421,9 +421,6 @@
IncrementLazyKeepaliveCount(extension);
}
}
-
- if (!keepalive_impulse_callback_for_testing_.is_null())
- keepalive_impulse_callback_for_testing_.Run(extension->id());
}
// DecrementLazyKeepaliveCount is called when no calls to KeepaliveImpulse
@@ -436,11 +433,8 @@
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())
- keepalive_impulse_decrement_callback_for_testing_.Run(i->first);
- }
i->second.previous_keepalive_impulse = i->second.keepalive_impulse;
i->second.keepalive_impulse = false;
@@ -559,16 +553,6 @@
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) {
« no previous file with comments | « trunk/src/extensions/browser/process_manager.h ('k') | trunk/src/ppapi/proxy/plugin_main_nacl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698