Add separate send-side UMA stats for screenshare and video.

talk/media/webrtc/webrtcvideoengine2_unittest.cc

Index: talk/media/webrtc/webrtcvideoengine2_unittest.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
index 87a0ac81a9d8c0ab9f5aee428b4b708f208edac9..d1f95a7da4725bdd71b14f5434a4d52fa66b5535 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -41,6 +41,7 @@
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/test/field_trial.h"
+#include "webrtc/test/histogram.h"
 #include "webrtc/video_encoder.h"
 
 namespace {
@@ -1554,6 +1555,7 @@ TEST_F(WebRtcVideoChannel2Test, DISABLED_SetBandwidthInConference) {
 }
 
 TEST_F(WebRtcVideoChannel2Test, UsesCorrectSettingsForScreencast) {
+  webrtc::test::ClearHistograms();
   static const int kScreenshareMinBitrateKbps = 800;
   cricket::VideoCodec codec = kVp8Codec360p;
   cricket::VideoSendParameters parameters;
@@ -1593,7 +1595,10 @@ TEST_F(WebRtcVideoChannel2Test, UsesCorrectSettingsForScreencast) {
   capturer.SetScreencast(true);
   EXPECT_TRUE(capturer.CaptureFrame());
 
-  EXPECT_EQ(2, send_stream->GetNumberOfSwappedFrames());
+  // Changing content type to screen will reset stream, so number of swapped
+  // frames will be reset.
+  send_stream = fake_call_->GetVideoSendStreams().front();
+  EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames());
 
   // Verify screencast settings.
   encoder_config = send_stream->GetEncoderConfig();
@@ -1879,6 +1884,7 @@ void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse,
   overuse_callback->OnLoadUpdate(webrtc::LoadObserver::kOveruse);
 
   EXPECT_TRUE(capturer.CaptureFrame());
+  send_stream = fake_call_->GetVideoSendStreams().front();
   EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames());
 
   if (enable_overuse && !is_screenshare) {
@@ -2911,6 +2917,8 @@ TEST_F(WebRtcVideoChannel2Test, ConfiguresLocalSsrcOnExistingReceivers) {
   TestReceiverLocalSsrcConfiguration(true);
 }
 
+TEST_F(WebRtcVideoChannel2Test, UpdatesStatsDependingOnContentType) {}
+
 class WebRtcVideoEngine2SimulcastTest : public testing::Test {};
 
 // Test that if we add a stream with RTX SSRC's, SSRC's get set correctly.