Revert of New statistics interface for APM

webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class EcMetricsTest : public AfterStreamingFixture {
 };
 
-TEST_F(EcMetricsTest, EcMetricsAreOnByDefault) {
-  // AEC must be enabled fist.
-  EXPECT_EQ(0, voe_apm_->SetEcStatus(true, webrtc::kEcAec));
-
-  bool enabled = false;
+TEST_F(EcMetricsTest, EcMetricsAreOffByDefault) {
+  bool enabled = true;
   EXPECT_EQ(0, voe_apm_->GetEcMetricsStatus(enabled));
-  EXPECT_TRUE(enabled);
+  EXPECT_FALSE(enabled);
 }
 
 TEST_F(EcMetricsTest, CanEnableAndDisableEcMetrics) {
-  // AEC must be enabled fist.
-  EXPECT_EQ(0, voe_apm_->SetEcStatus(true, webrtc::kEcAec));
-
   EXPECT_EQ(0, voe_apm_->SetEcMetricsStatus(true));
   bool ec_on = false;
   EXPECT_EQ(0, voe_apm_->GetEcMetricsStatus(ec_on));
   ASSERT_TRUE(ec_on);
   EXPECT_EQ(0, voe_apm_->SetEcMetricsStatus(false));
   EXPECT_EQ(0, voe_apm_->GetEcMetricsStatus(ec_on));
   ASSERT_FALSE(ec_on);
 }
 
 TEST_F(EcMetricsTest, ManualTestEcMetrics) {
@@ skipping 48 matching lines @@
   for (int i = 0; i < 5; i++) {
     int delay, delay_std;
     float fraction_poor_delays;
     EXPECT_EQ(0, voe_apm_->GetEcDelayMetrics(delay, delay_std,
                                              fraction_poor_delays));
     TEST_LOG("Delay = %d, Delay Std = %d, Fraction poor delays = %3.1f\n",
              delay, delay_std, fraction_poor_delays * 100);
     Sleep(1000);
   }
 }