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

Unified Diff: extensions/browser/process_manager.cc

Issue 124313005: Revert of Test Keeping NaCl plugins used in app background pages alive when active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « extensions/browser/process_manager.h ('k') | ppapi/proxy/plugin_main_nacl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/process_manager.cc
diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc
index b4e7357ad035b1f25aa82fb964b2d9e7807c4e3b..7a362e329a387c7b90e8b3776fc65accb7e26723 100644
--- a/extensions/browser/process_manager.cc
+++ b/extensions/browser/process_manager.cc
@@ -442,9 +442,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
@@ -457,11 +454,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;
@@ -580,16 +574,6 @@
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,
« no previous file with comments | « extensions/browser/process_manager.h ('k') | ppapi/proxy/plugin_main_nacl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698