Revert of Move audioproc_test_utils into enable_protobuf condition.

webrtc/modules/audio_processing/audio_processing_tests.gypi

 # 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.
 
 {
   'targets': [
     {
+      'target_name': 'audioproc_test_utils',
+      'type': 'static_library',
+      'dependencies': [
+        'audioproc_debug_proto',
+        '<(webrtc_root)/base/base.gyp:rtc_base_approved',
+        '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
+      ],
+      'sources': [
+        'test/audio_file_processor.cc',
+        'test/audio_file_processor.h',
+        'test/test_utils.cc',
+        'test/test_utils.h',
+      ],
+    },
+    {
       'target_name': 'transient_suppression_test',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         '<(webrtc_root)/test/test.gyp:test_support',
         '<(webrtc_root)/modules/modules.gyp:audio_processing',
       ],
       'sources': [
         'transient/transient_suppression_test.cc',
@@ skipping 37 matching lines @@
       ],
       'sources': [
         'intelligibility/test/intelligibility_proc.cc',
       ],
     }, # intelligibility_proc
   ],
   'conditions': [
     ['enable_protobuf==1', {
       'targets': [
         {
-          'target_name': 'audioproc_test_utils',
-          'type': 'static_library',
-          'dependencies': [
-            'audioproc_debug_proto',
-            '<(webrtc_root)/base/base.gyp:rtc_base_approved',
-            '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
-          ],
-          'sources': [
-            'test/audio_file_processor.cc',
-            'test/audio_file_processor.h',
-            'test/test_utils.cc',
-            'test/test_utils.h',
-          ],
-        },
-        {
           'target_name': 'audioproc_unittest_proto',
           'type': 'static_library',
           'sources': [ 'test/unittest.proto', ],
           'variables': {
             'proto_in_dir': 'test',
             # Workaround to protect against gyp's pathname relativization when
             # this file is included by modules.gyp.
             'proto_out_protected': 'webrtc/audio_processing',
             'proto_out_dir': '<(proto_out_protected)',
           },
@@ skipping 49 matching lines @@
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
             '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
           ],
           'sources': [ 'test/unpack.cc', ],
         },
       ],
     }],
   ],
 }