Merge 59594 - Fixes for a couple of ChromeFrame crashes seen in the latest de...

chrome_frame/metrics_service.h

Index: chrome_frame/metrics_service.h
===================================================================
--- chrome_frame/metrics_service.h	(revision 61087)
+++ chrome_frame/metrics_service.h	(working copy)
@@ -35,6 +35,9 @@
   void InitializeMetricsState();
 
  private:
+  // To enable the default traits object to create an instance of this class.
+  friend struct base::DefaultLazyInstanceTraits<MetricsService>;
+
   MetricsService();
   virtual ~MetricsService();
   // The MetricsService has a lifecycle that is stored as a state.
@@ -135,9 +138,6 @@
   // A number that identifies the how many times the app has been launched.
   int session_id_;
 
-  static base::LazyInstance<base::ThreadLocalPointer<MetricsService> >
-      g_metrics_instance_;
-
   PlatformThreadId thread_;
 
   // Indicates if this is the first uma upload from this instance.