Fixes for a couple of ChromeFrame crashes seen in the latest dev channel buil...

chrome_frame/metrics_service.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
 #ifndef CHROME_FRAME_METRICS_METRICS_SERVICE_H_
 #define CHROME_FRAME_METRICS_METRICS_SERVICE_H_
 
@@ skipping 17 matching lines @@
   // Start/stop the metrics recording and uploading machine.  These should be
   // used on startup and when the user clicks the checkbox in the prefs.
   // StartRecordingOnly starts the metrics recording but not reporting, for use
   // in tests only.
   static void Start();
   static void Stop();
   // Set up client ID, session ID, etc.
   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.
   // See metrics_service.cc for description of this lifecycle.
   enum State {
     INITIALIZED,            // Constructor was called.
     ACTIVE,                 // Accumalating log data
     STOPPED,                // Service has stopped
   };
 
@@ skipping 80 matching lines @@
 
   // The URL for the metrics server.
   std::wstring server_url_;
 
   // The identifier that's sent to the server with the log reports.
   std::string client_id_;
 
   // 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.
   bool initial_uma_upload_;
 
   // The transmission timer id returned by SetTimer
   int transmission_timer_id_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsService);
 };
 
 #endif  // CHROME_FRAME_METRICS_METRICS_SERVICE_H_