Reland of New statistics interface for APM

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

Index: webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc
diff --git a/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc b/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc
index a202aea2801ab214ae6c0569116518d229df7a1a..758a0850ed0cbfecbdb73d897c3a064d9f591162 100644
--- a/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc
+++ b/webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc
@@ -13,13 +13,19 @@
 class EcMetricsTest : public AfterStreamingFixture {
 };
 
-TEST_F(EcMetricsTest, EcMetricsAreOffByDefault) {
-  bool enabled = true;
+TEST_F(EcMetricsTest, EcMetricsAreOnByDefault) {
+  // AEC must be enabled fist.
+  EXPECT_EQ(0, voe_apm_->SetEcStatus(true, webrtc::kEcAec));
+
+  bool enabled = false;
   EXPECT_EQ(0, voe_apm_->GetEcMetricsStatus(enabled));
-  EXPECT_FALSE(enabled);
+  EXPECT_TRUE(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));