Switch DesktopEnvironment to return a DesktopCapturer.

remoting/test/protocol_perftest.cc

 // 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.
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 330 matching lines @@
 // Frame generator that rewrites the whole screen every 60th frame. Should only
 // be used with the VERBATIM codec as the allocated frame may contain arbitrary
 // data.
 class IntermittentChangeFrameGenerator
     : public base::RefCountedThreadSafe<IntermittentChangeFrameGenerator> {
  public:
   IntermittentChangeFrameGenerator()
       : frame_index_(0) {}
 
   scoped_ptr<webrtc::DesktopFrame> GenerateFrame(
-      webrtc::ScreenCapturer::Callback* callback) {
+      webrtc::DesktopCapturer::Callback* callback) {
     const int kWidth = 800;
     const int kHeight = 600;
 
     bool fresh_frame = false;
     if (frame_index_ % 60 == 0 || !current_frame_) {
       current_frame_.reset(webrtc::SharedDesktopFrame::Wrap(
           new webrtc::BasicDesktopFrame(webrtc::DesktopSize(kWidth, kHeight))));
       fresh_frame = true;
     }
     ++frame_index_;
@@ skipping 31 matching lines @@
     base::TimeDelta latency;
     ReceiveFrame(&latency);
     LOG(INFO) << "Latency: " << latency.InMillisecondsF()
               << "ms Encode: " << last_video_packet_->encode_time_ms()
               << "ms Capture: " << last_video_packet_->capture_time_ms()
               << "ms";
   }
 }
 
 }  // namespace remoting