Move more metrics classes to metrics namespace.

chrome/browser/metrics/metrics_services_manager.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_SERVICES_MANAGER_H_
 #define CHROME_BROWSER_METRICS_METRICS_SERVICES_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 
 class ChromeMetricsServiceClient;
-class MetricsService;
 class PrefService;
 
 namespace base {
 class FilePath;
 }
 
 namespace metrics {
+class MetricsService;
 class MetricsStateManager;
 }
 
 namespace rappor {
 class RapporService;
 }
 
 namespace chrome_variations {
 class VariationsService;
 }
 
 // MetricsServicesManager is a helper class that has ownership over the various
 // metrics-related services in Chrome: MetricsService (via its client),
 // RapporService and VariationsService.
 class MetricsServicesManager {
  public:
   // Creates the MetricsServicesManager with the |local_state| prefs service.
   explicit MetricsServicesManager(PrefService* local_state);
   virtual ~MetricsServicesManager();
 
   // Returns the MetricsService, creating it if it hasn't been created yet (and
   // additionally creating the ChromeMetricsServiceClient in that case).
-  MetricsService* GetMetricsService();
+  metrics::MetricsService* GetMetricsService();
 
   // Returns the GetRapporService, creating it if it hasn't been created yet.
   rappor::RapporService* GetRapporService();
 
   // Returns the VariationsService, creating it if it hasn't been created yet.
   chrome_variations::VariationsService* GetVariationsService();
 
   // Should be called when a plugin loading error occurs.
   void OnPluginLoadingError(const base::FilePath& plugin_path);
 
@@ skipping 23 matching lines @@
   // The RapporService, for RAPPOR metric uploads.
   scoped_ptr<rappor::RapporService> rappor_service_;
 
   // The VariationsService, for server-side experiments infrastructure.
   scoped_ptr<chrome_variations::VariationsService> variations_service_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsServicesManager);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_SERVICES_MANAGER_H_