Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/shaped_desktop_capturer_unittest.cc

Index: remoting/host/shaped_desktop_capturer_unittest.cc
diff --git a/remoting/host/shaped_screen_capturer_unittest.cc b/remoting/host/shaped_desktop_capturer_unittest.cc
similarity index 86%
rename from remoting/host/shaped_screen_capturer_unittest.cc
rename to remoting/host/shaped_desktop_capturer_unittest.cc
index 1be21bf0d3cdc64501019661eadbc5f2cef422c1..115bd24f7b11e8409564b16b96d3058d16dc27a2 100644
--- a/remoting/host/shaped_screen_capturer_unittest.cc
+++ b/remoting/host/shaped_desktop_capturer_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/shaped_screen_capturer.h"
+#include "remoting/host/shaped_desktop_capturer.h"
 
 #include "remoting/host/desktop_shape_tracker.h"
-#include "remoting/host/fake_screen_capturer.h"
+#include "remoting/host/fake_desktop_capturer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
@@ -39,7 +39,7 @@ class FakeDesktopShapeTracker : public DesktopShapeTracker {
   webrtc::DesktopRegion shape_;
 };
 
-class ShapedScreenCapturerTest : public testing::Test,
+class ShapedDesktopCapturerTest : public testing::Test,
                                  public webrtc::DesktopCapturer::Callback {
  public:
   // webrtc::DesktopCapturer::Callback interface
@@ -55,9 +55,9 @@ class ShapedScreenCapturerTest : public testing::Test,
 };
 
 // Verify that captured frame have shape.
-TEST_F(ShapedScreenCapturerTest, Basic) {
-  ShapedScreenCapturer capturer(
-      scoped_ptr<webrtc::ScreenCapturer>(new FakeScreenCapturer()),
+TEST_F(ShapedDesktopCapturerTest, Basic) {
+  ShapedDesktopCapturer capturer(
+      scoped_ptr<webrtc::DesktopCapturer>(new FakeDesktopCapturer()),
       scoped_ptr<DesktopShapeTracker>(new FakeDesktopShapeTracker()));
   capturer.Start(this);
   capturer.Capture(webrtc::DesktopRegion());