Move webrtc specific tests into the enable_webrtc==1 guard.

Remove webrtc specific tests when enable_webrtc is not set to 1.

R=jam@chromium.org, wjia@chromium.org
TBR=jam

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245220

[wjia(left Chromium), 2014-01-10 00:13:42]

lgtm. You can use TBR for minor change.

[commit-bot: I haz the power, 2014-01-10 06:27:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ronghuawu@chromium.org/132903002/1

[commit-bot: I haz the power, 2014-01-10 06:27:38]

Failed to apply patch for content/content_tests.gypi:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file content/content_tests.gypi
  Hunk #1 FAILED at 538.
  Hunk #2 succeeded at 682 (offset 1 line).
  Hunk #3 succeeded at 697 (offset 1 line).
  Hunk #4 succeeded at 714 (offset 1 line).
  1 out of 4 hunks FAILED -- saving rejects to file
content/content_tests.gypi.rej

Patch:       content/content_tests.gypi
Index: content/content_tests.gypi
===================================================================
--- content/content_tests.gypi	(revision 244026)
+++ content/content_tests.gypi	(working copy)
@@ -538,12 +538,10 @@
         'renderer/media/buffered_resource_loader_unittest.cc',
         'renderer/media/cache_util_unittest.cc',
         'renderer/media/crypto/key_systems_unittest.cc',
-        'renderer/media/media_stream_video_source_unittest.cc',
         'renderer/media/test_response_generator.cc',
         'renderer/media/test_response_generator.h',
         'renderer/media/video_capture_impl_unittest.cc',
         'renderer/media/video_capture_message_filter_unittest.cc',
-        'renderer/media/video_destination_handler_unittest.cc',
         'renderer/media/webaudiosourceprovider_impl_unittest.cc',
         'renderer/npapi/webplugin_impl_unittest.cc',
         'renderer/paint_aggregator_unittest.cc',
@@ -681,7 +679,6 @@
           ],
           'sources!': [
             'browser/plugin_loader_posix_unittest.cc',
-            'renderer/media/video_destination_handler_unittest.cc',
           ],
         }],
         ['enable_webrtc==1', {
@@ -697,8 +694,10 @@
             'renderer/media/media_stream_dependency_factory_unittest.cc',
             'renderer/media/media_stream_dispatcher_unittest.cc',
             'renderer/media/media_stream_impl_unittest.cc',
+            'renderer/media/media_stream_video_source_unittest.cc',
             'renderer/media/rtc_peer_connection_handler_unittest.cc',
             'renderer/media/rtc_video_decoder_unittest.cc',
+            'renderer/media/video_destination_handler_unittest.cc',
             'renderer/media/video_source_handler_unittest.cc',
             'renderer/media/webrtc_audio_capturer_unittest.cc',
             'renderer/media/webrtc_audio_device_unittest.cc',
@@ -712,10 +711,6 @@
             '../third_party/webrtc/modules/modules.gyp:video_capture_module',
             '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
           ]
-        }, {
-          'sources!': [
-            'renderer/media/video_destination_handler_unittest.cc',
-          ],
         }],
         ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
           'sources': [

[commit-bot: I haz the power, 2014-01-10 06:37:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ronghuawu@chromium.org/132903002/230001

[commit-bot: I haz the power, 2014-01-10 07:36:58]

Retried try job too often on android_dbg for step(s) slave_steps
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[jam, 2014-01-10 16:57:43]

the convention from the beginning of gypi files is that all files are listed in
the default section, and then are removed selectively depending on
platform/config

[Ronghua Wu (Left Chromium), 2014-01-10 23:00:42]

Updated. PTAL

Is the idea behind this convention to have all the files listed in IDEs like
visual studio? It does cause duplication in the gyp files though.

[Ronghua Wu (Left Chromium), 2014-01-14 18:02:47]

Hi John, do you want another look on this?

[Ronghua Wu (Left Chromium), 2014-01-15 21:35:00]

ping for approval

[Ronghua Wu (Left Chromium), 2014-01-16 16:26:10]

Add few more owners in case jam@ is not around.

[jam, 2014-01-16 16:46:09]

On 2014/01/16 16:26:10, Ronghua Wu wrote:
> Add few more owners in case jam@ is not around.

sorry I missed your replies. in the future please feel free to email me directly
or ping me over IM if i dont reply within half a day or so

[jam, 2014-01-16 16:46:15]

lgtm

[Ronghua Wu (Left Chromium), 2014-01-16 16:53:44]

On 2014/01/16 16:46:09, jam wrote:
> On 2014/01/16 16:26:10, Ronghua Wu wrote:
> > Add few more owners in case jam@ is not around.
> 
> sorry I missed your replies. in the future please feel free to email me
directly
> or ping me over IM if i dont reply within half a day or so

Thanks John, will do in the future.

[Ronghua Wu (Left Chromium), 2014-01-16 17:17:12]

Committed patchset #4 manually as r245220 (presubmit successful).