[Metrics] Merge MetricsService and MetricsServiceBase classes.

chrome/browser/metrics/metrics_service_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/metrics/metrics_service.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/threading/platform_thread.h"
@@ skipping 20 matching lines @@
 using metrics::MetricsLogManager;
 
 class TestMetricsService : public MetricsService {
  public:
   TestMetricsService(metrics::MetricsStateManager* state_manager,
                      metrics::MetricsServiceClient* client)
       : MetricsService(state_manager, client) {
   }
   virtual ~TestMetricsService() {}
 
-  MetricsLogManager* log_manager() {
-    return &log_manager_;
-  }
+  using MetricsService::log_manager;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestMetricsService);
 };
 
 #if defined(OS_CHROMEOS)
 class TestMetricsLogChromeOS : public MetricsLogChromeOS {
  public:
   explicit TestMetricsLogChromeOS(
       metrics::ChromeUserMetricsExtension* uma_proto)
@@ skipping 307 matching lines @@
 
   service.RemoveObserver(&observer1);
 
   service.OpenNewLog();
   EXPECT_EQ(2, observer1.observed());
   EXPECT_EQ(2, observer2.observed());
   service.log_manager_.FinishCurrentLog();
 
   service.RemoveObserver(&observer2);
 }