Reland: content_{renderer,tests}.gypi cleanup of plugin+webrtc sources

content/test/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//media/media_options.gni")
@@ skipping 593 matching lines @@
     if (is_linux || is_mac || is_win) {
       sources +=
           [ "../browser/media/capture/desktop_capture_device_unittest.cc" ]
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
 
     if (is_chromeos) {
       sources +=
           [ "../browser/media/capture/desktop_capture_device_aura_unittest.cc" ]
     }
-  } else {
-    if (enable_plugins) {
-      # This file is added only when plugins are enabled, but we don't want it
-      # unless webrtc is also enabled.
-      sources -=
-          [ "../renderer/media/pepper_to_video_track_adapter_unittest.cc" ]
-    }
   }
 
   if (enable_web_speech) {
     sources +=
         rebase_path(content_tests_gypi_values.content_unittests_speech_sources,
                     ".",
                     "//content")
   }
 
   if (is_linux) {
@@ skipping 166 matching lines @@
       "//testing/gtest",
       "//third_party/WebKit/public:blink",
       "//ui/base",
       "//ui/gfx",
       "//ui/gfx/geometry",
       "//ui/gl",
       "//ui/gl:test_support",
     ]
   }
 }