Move thread local stuff from base to base/threading and consistently use the...

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_
+#ifndef CHROME_FRAME_METRICS_SERVICE_H_
+#define CHROME_FRAME_METRICS_SERVICE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/lock.h"
 #include "base/metrics/histogram.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
-#include "base/thread_local.h"
+#include "base/threading/thread_local.h"
 #include "chrome/common/metrics_helpers.h"
 
 // TODO(ananta)
 // Refactor more common code from chrome/browser/metrics/metrics_service.h into
 // the MetricsServiceBase class.
 class MetricsService : public MetricsServiceBase {
  public:
   static MetricsService* GetInstance();
   // Start/stop the metrics recording and uploading machine.  These should be
   // used on startup and when the user clicks the checkbox in the prefs.
@@ skipping 115 matching lines @@
 
   // The transmission timer id returned by SetTimer
   int transmission_timer_id_;
 
   // Used to serialize the Start and Stop operations on the metrics service.
   static Lock metrics_service_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsService);
 };
 
-#endif  // CHROME_FRAME_METRICS_METRICS_SERVICE_H_
+#endif  // CHROME_FRAME_METRICS_SERVICE_H_