Merge webrtc_utility_unittests into modules_unittests.

This CL eliminates the webrtc_utility_unittests test target.

NOTICE: Upon committing, this test must be removed from the
Buildbot configuration.

BUG=1843
TEST=trybots passing. Compiled and ran modules_unittests, verified the
AudioFrameOperationsTest test executes and passes.

R=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1584004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4181 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/modules.gyp

@@ -56,11 +56,13 @@
           'target_name': 'modules_unittests',
           'type': 'executable',
           'dependencies': [
+            'webrtc_utility',
             '<(DEPTH)/testing/gtest.gyp:gtest',
             '<(webrtc_root)/test/test.gyp:test_support_main',
           ],
           'sources': [
             'module_common_types_unittest.cc',
+            'utility/source/audio_frame_operations_unittest.cc',
           ],
         },
       ],

webrtc/modules/utility/source/utility.gypi

@@ -67,22 +67,4 @@
       ],
     },
   ], # targets
-  'conditions': [
-    ['include_tests==1', {
-      'targets': [
-        {
-          'target_name': 'webrtc_utility_unittests',
-          'type': 'executable',
-          'dependencies': [
-            'webrtc_utility',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(webrtc_root)/test/test.gyp:test_support_main',
-          ],
-          'sources': [
-            'audio_frame_operations_unittest.cc',
-          ],
-        }, # webrtc_utility_unittests
-      ], # targets
-    }], # include_tests
-  ], # conditions
 }