Revert of Split IncomingVideoStream into two implementations, with smoothing and without.

webrtc/common_video/BUILD.gn

 # Copyright (c) 2014 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.
 
 import("../build/webrtc.gni")
 import("//testing/test.gni")
@@ skipping 42 matching lines @@
   ]
 
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     "..:webrtc_common",
-    "../base:rtc_task_queue",
     "../system_wrappers",
   ]
 
   if (rtc_build_libyuv) {
     deps += [ "$rtc_libyuv_dir" ]
     public_deps = [
       "$rtc_libyuv_dir",
     ]
   } else {
     # Need to add a directory normally exported by libyuv.
@@ skipping 13 matching lines @@
   test("common_video_unittests") {
     testonly = true
 
     sources = [
       "bitrate_adjuster_unittest.cc",
       "h264/pps_parser_unittest.cc",
       "h264/sps_parser_unittest.cc",
       "h264/sps_vui_rewriter_unittest.cc",
       "i420_buffer_pool_unittest.cc",
       "i420_video_frame_unittest.cc",
-      "incoming_video_stream_unittest.cc",
       "libyuv/libyuv_unittest.cc",
       "libyuv/scaler_unittest.cc",
     ]
 
     configs += [ "..:common_config" ]
     public_configs = [ "..:common_inherited_config" ]
 
     # TODO(jschuh): Bug 1348: fix this warning.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
@@ skipping 16 matching lines @@
       deps += [ "//testing/android/native_test:native_test_support" ]
 
       # This needs to be kept in sync with the .isolate file.
       # TODO(kjellander); Move this to android_assets targets instead.
       data = [
         "//resources/foreman_cif.yuv",
       ]
     }
   }
 }