Simplify CaptureRenderAdapter.

talk/media/base/capturemanager_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 85 matching lines @@
 }
 
 TEST_F(CaptureManagerTest, InvalidAddingRemoving) {
   EXPECT_FALSE(capture_manager_.StopVideoCapture(&video_capturer_,
                                                  cricket::VideoFormat()));
   EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,
                                                  format_vga_));
   EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
   EXPECT_EQ(1, callback_count());
   EXPECT_FALSE(capture_manager_.AddVideoRenderer(&video_capturer_, NULL));
-  EXPECT_FALSE(capture_manager_.RemoveVideoRenderer(&video_capturer_,
-                                                    &video_renderer_));
   EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_, format_vga_));
 }
 
 // Valid use cases
 TEST_F(CaptureManagerTest, KeepFirstResolutionHigh) {
   EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,
                                                  format_vga_));
   EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
   EXPECT_EQ(1, callback_count());
   EXPECT_TRUE(capture_manager_.AddVideoRenderer(&video_capturer_,
@@ skipping 102 matching lines @@
   // Now request restart with qvga.
   EXPECT_TRUE(capture_manager_.RestartVideoCapture(
       &video_capturer_, format_vga_, format_qvga_,
       cricket::CaptureManager::kRequestRestart));
   EXPECT_TRUE(video_capturer_.CaptureFrame());
   EXPECT_EQ(2, NumFramesRendered());
   EXPECT_TRUE(WasRenderedResolution(format_vga_));
   EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_,
                                                 format_qvga_));
 }