summaryrefslogtreecommitdiffstats
path: root/extensions/browser/process_manager.h
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 17:44:49 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 17:44:49 +0000
commit473bdc43543599e19a749a530b839fac5f865e0c (patch)
tree353ccdcb0dda627db2bee51e58c0bb6aa089730e /extensions/browser/process_manager.h
parenta81d10de6edbd00a19c66ebaa57cfc54a6e64e23 (diff)
downloadchromium_src-473bdc43543599e19a749a530b839fac5f865e0c.zip
chromium_src-473bdc43543599e19a749a530b839fac5f865e0c.tar.gz
chromium_src-473bdc43543599e19a749a530b839fac5f865e0c.tar.bz2
Revert 242061 "Test Keeping NaCl plugins used in app background ..."
Broke this test Mac ASAN 64 Tests (1): http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%2064%20Tests%20%281%29/builds/402 AppBackgroundPageNaClTest.BackgroundKeepaliveActive (run #1): [ RUN ] AppBackgroundPageNaClTest.BackgroundKeepaliveActive [6102,475938816:04:26:31.429668] Native Client module will be loaded at base address 0x000066c200000000 [6104,475938816:04:26:32.535943] Native Client module will be loaded at base address 0x00003d5a00000000 ASAN:SIGSEGV ================================================================= ==6095==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000050 (pc 0x000106384d7b sp 0x7fff5d44fde0 bp 0x7fff5d450000 T0) #0 0x106384d7a (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103bdbd7a) #1 0x106384a31 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103bdba31) #2 0x11296475a (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x1101bb75a) #3 0x112964905 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x1101bb905) #4 0x1061f4e33 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103a4be33) #5 0x1061f45af (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103a4b5af) #6 0x1049070ec (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x10215e0ec) #7 0x104902b5b (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x102159b5b) #8 0x109457b06 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x106caeb06) #9 0x109ca6d33 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x1074fdd33) #10 0x109453876 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x106caa876) #11 0x10945e99e (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x106cb599e) #12 0x10944b514 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x106ca2514) #13 0x112896341 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x1100ed341) #14 0x1061f1486 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103a48486) #15 0x106f2bac3 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x104782ac3) #16 0x106f2e6f0 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x1047856f0) #17 0x106f2f63e (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x10478663e) #18 0x106f438e8 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x10479a8e8) #19 0x106f42939 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x104799939) #20 0x10645d4e5 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103cb44e5) #21 0x1061ecafe (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103a43afe) #22 0x11295833d (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x1101af33d) #23 0x1061ec995 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x103a43995) #24 0x1027ab5c3 (/Volumes/data/b/build/slave/Mac_ASAN_64_Tests__1_/build/src/out/Release/browser_tests+0x1000025c3) #25 0xe AddressSanitizer can not provide additional info. SUMMARY: AddressSanitizer: SEGV ??:0 ?? ==6095==ABORTING > Test Keeping NaCl plugins used in app background pages alive when active. > > Activity in Native Client plugins results in IPC messages > sent to the BrowserPpapiHostImpl and routed to call > extensions::ProcessManager::KeepaliveImpulse. > > Testing patch, builds on implementation. See: > https://codereview.chromium.org/61063003/ Implementation. > https://codereview.chromium.org/105873003/ Cumulative patch. > > Design doc: > https://docs.google.com/a/chromium.org/document/d/1mI0lS1rfAf-BAGLmWAEcWy37Xq9dOvgfMx8OqeUMXts/edit# > > BUG=298339 > > Review URL: https://codereview.chromium.org/111563006 TBR=scheib@chromium.org Review URL: https://codereview.chromium.org/118533004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/process_manager.h')
-rw-r--r--extensions/browser/process_manager.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/extensions/browser/process_manager.h b/extensions/browser/process_manager.h
index 4aa5141..fa5f2b6 100644
--- a/extensions/browser/process_manager.h
+++ b/extensions/browser/process_manager.h
@@ -120,14 +120,6 @@ class ProcessManager : public content::NotificationObserver {
// related SiteInstances.
content::BrowserContext* GetBrowserContext() const;
- // Sets callbacks for testing keepalive impulse behavior.
- typedef base::Callback<void(const std::string& extension_id)>
- ImpulseCallbackForTesting;
- void SetKeepaliveImpulseCallbackForTesting(
- const ImpulseCallbackForTesting& callback);
- void SetKeepaliveImpulseDecrementCallbackForTesting(
- const ImpulseCallbackForTesting& callback);
-
protected:
// If |context| is incognito pass the master context as |original_context|.
// Otherwise pass the same context for both.
@@ -223,9 +215,6 @@ class ProcessManager : public content::NotificationObserver {
base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
- ImpulseCallbackForTesting keepalive_impulse_callback_for_testing_;
- ImpulseCallbackForTesting keepalive_impulse_decrement_callback_for_testing_;
-
base::WeakPtrFactory<ProcessManager> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(ProcessManager);