summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome_frame/chrome_frame_automation.cc2
-rw-r--r--chrome_frame/metrics_service.cc2
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.