diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 23:40:21 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 23:40:21 +0000 |
| commit | ebc23d2a9540ff9dafab4f029bca31b99310d62d (patch) | |
| tree | aaea2eb1dca4c381e810e524aa20ed3ceec0bf22 /chrome_frame | |
| parent | c5546e428d96d6587bbf17f047ab5741ffc2c77c (diff) | |
| download | chromium_src-ebc23d2a9540ff9dafab4f029bca31b99310d62d.zip chromium_src-ebc23d2a9540ff9dafab4f029bca31b99310d62d.tar.gz chromium_src-ebc23d2a9540ff9dafab4f029bca31b99310d62d.tar.bz2 | |
Use the LeakyLazyInstanceTraits in the ProxyFactory and metrics upload thread objects
in ChromeFrame as we don't control the threads on which these objects are instantiated
and thus cannot terminate them gracefully.
This should suppress the annoying DCHECKS during IE shutdown.
Review URL: http://codereview.chromium.org/4517002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/metrics_service.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 35f36e7..d50f26b 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -551,7 +551,7 @@ bool ProxyFactory::ReleaseAutomationServer(void* server_id, return true; } -Singleton<ProxyFactory> g_proxy_factory; +Singleton<ProxyFactory, LeakySingletonTraits<ProxyFactory> > g_proxy_factory; template <> struct RunnableMethodTraits<ChromeFrameAutomationClient> { static void RetainCallee(ChromeFrameAutomationClient* obj) {} diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index 6af2c0e..fd52b8a 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -98,7 +98,7 @@ base::LazyInstance<MetricsService> // Traits to create an instance of the ChromeFrame upload thread. struct UploadThreadInstanceTraits - : public base::DefaultLazyInstanceTraits<base::Thread> { + : public base::LeakyLazyInstanceTraits<base::Thread> { static base::Thread* New(void* instance) { // Use placement new to initialize our instance in our preallocated space. // The parenthesis is very important here to force POD type initialization. |