diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:39:50 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:39:50 +0000 |
commit | 3aef722b8c533efc87df683a454f0779f9b6cabb (patch) | |
tree | e687bdf23ab862c8b7eaca3e094e0caa5d8ee328 /remoting/host/chromoting_host_unittest.cc | |
parent | 67c3f94c2242e71dfe3688985b5f0b781997bb4b (diff) | |
download | chromium_src-3aef722b8c533efc87df683a454f0779f9b6cabb.zip chromium_src-3aef722b8c533efc87df683a454f0779f9b6cabb.tar.gz chromium_src-3aef722b8c533efc87df683a454f0779f9b6cabb.tar.bz2 |
Remove screen capturers from media/video/capture/screen.
Screen capturers have been moved to webrtc. This change
switches chromoting and getUserMedia() to the new copy of the
capturers in webrtc and removes old copy from media.
TBR=jschuh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15692018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
-rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index f7b56e2..e780eda 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -6,13 +6,13 @@ #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" -#include "media/video/capture/screen/screen_capturer_fake.h" #include "remoting/base/auto_thread_task_runner.h" #include "remoting/host/audio_capturer.h" #include "remoting/host/chromoting_host.h" #include "remoting/host/chromoting_host_context.h" #include "remoting/host/desktop_environment.h" #include "remoting/host/host_mock_objects.h" +#include "remoting/host/screen_capturer_fake.h" #include "remoting/jingle_glue/mock_objects.h" #include "remoting/proto/video.pb.h" #include "remoting/protocol/errors.h" @@ -231,7 +231,7 @@ class ChromotingHostTest : public testing::Test { host_->OnSessionRouteChange(get_client(0), channel_name, route); } - // Creates a DesktopEnvironment with a fake media::ScreenCapturer, to mock + // Creates a DesktopEnvironment with a fake webrtc::ScreenCapturer, to mock // DesktopEnvironmentFactory::Create(). DesktopEnvironment* CreateDesktopEnvironment() { MockDesktopEnvironment* desktop_environment = new MockDesktopEnvironment(); @@ -261,10 +261,10 @@ class ChromotingHostTest : public testing::Test { return input_injector; } - // Creates a fake media::ScreenCapturer, to mock + // Creates a fake webrtc::ScreenCapturer, to mock // DesktopEnvironment::CreateVideoCapturer(). - media::ScreenCapturer* CreateVideoCapturer() { - return new media::ScreenCapturerFake(); + webrtc::ScreenCapturer* CreateVideoCapturer() { + return new ScreenCapturerFake(); } void DisconnectAllClients() { |