commit dedaf1ced7ed8fc7a1a304fd9a8176fd232f7a7c
author ehmaldonado <ehmaldonado@webrtc.org> Fri Nov 18 04:52:22 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 18 12:52:31 2016 +0000
tree a3a1044af0e573ccb810bfe29c39741430506ffc
parent bbc747c116c731c6f6fbcc4dd1d98da520c03179

Modify audio_processing_unittest to use ResourcePath instead of ProjectRootPath.

Move the resources to //resources and upload them to Google Storage.

BUG=webrtc:6727

Review-Url: https://codereview.webrtc.org/2508943004
Cr-Commit-Position: refs/heads/master@{#15152}

webrtc/modules/BUILD.gn

diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index 9120541..042b38e 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -138,9 +138,6 @@
   }
 
   modules_unittests_resources = [
-    "//data/audio_processing/output_data_fixed.pb",
-    "//data/audio_processing/output_data_float.pb",
-    "//data/audio_processing/output_data_mac.pb",
     "//data/voice_engine/audio_tiny48.wav",
     "//resources/att-downlink.rx",
     "//resources/att-uplink.rx",
@@ -161,6 +158,9 @@
     "//resources/audio_processing/agc/agc_vad.dat",
     "//resources/audio_processing/agc/agc_voicing_prob.dat",
     "//resources/audio_processing/agc/agc_with_circular_buffer.dat",
+    "//resources/audio_processing/output_data_fixed.pb",
+    "//resources/audio_processing/output_data_float.pb",
+    "//resources/audio_processing/output_data_mac.pb",
     "//resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm",
     "//resources/audio_processing/transient/audio16kHz.pcm",
     "//resources/audio_processing/transient/audio32kHz.pcm",

webrtc/modules/audio_processing/audio_processing_unittest.cc

diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc
index fb2f214..139aa9d 100644
--- a/webrtc/modules/audio_processing/audio_processing_unittest.cc
+++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc
@@ -391,7 +391,6 @@
   void VerifyDebugDumpTest(Format format);
 
   const std::string output_path_;
-  const std::string ref_path_;
   const std::string ref_filename_;
   std::unique_ptr<AudioProcessing> apm_;
   AudioFrame* frame_;
@@ -407,21 +406,18 @@
 
 ApmTest::ApmTest()
     : output_path_(test::OutputPath()),
-#ifndef WEBRTC_IOS
-      ref_path_(test::ProjectRootPath() + "data/audio_processing/"),
-#else
-      // On iOS test data is flat in the project root dir
-      ref_path_(test::ProjectRootPath()),
-#endif
 #if defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)
-      ref_filename_(ref_path_ + "output_data_fixed.pb"),
+      ref_filename_(test::ResourcePath("audio_processing/output_data_fixed",
+                                       "pb")),
 #elif defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE)
 #if defined(WEBRTC_MAC)
       // A different file for Mac is needed because on this platform the AEC
       // constant |kFixedDelayMs| value is 20 and not 50 as it is on the rest.
-      ref_filename_(ref_path_ + "output_data_mac.pb"),
+      ref_filename_(test::ResourcePath("audio_processing/output_data_mac",
+                                       "pb")),
 #else
-      ref_filename_(ref_path_ + "output_data_float.pb"),
+      ref_filename_(test::ResourcePath("audio_processing/output_data_float",
+                                       "pb")),
 #endif
 #endif
       frame_(NULL),