| Index: remoting/capturer/video_frame_capturer_unittest.cc | 
| diff --git a/remoting/host/video_frame_capturer_unittest.cc b/remoting/capturer/video_frame_capturer_unittest.cc | 
| similarity index 88% | 
| rename from remoting/host/video_frame_capturer_unittest.cc | 
| rename to remoting/capturer/video_frame_capturer_unittest.cc | 
| index bb69c6caa80e55c7de0701184266a63fedce2f7d..b7074f13bdaf06e39445de80e80ff59038c522b4 100644 | 
| --- a/remoting/host/video_frame_capturer_unittest.cc | 
| +++ b/remoting/capturer/video_frame_capturer_unittest.cc | 
| @@ -2,16 +2,15 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
|  | 
| -#include "remoting/host/video_frame_capturer.h" | 
| +#include "remoting/capturer/video_frame_capturer.h" | 
|  | 
| #include "base/bind.h" | 
| #if defined(OS_MACOSX) | 
| #include "base/mac/mac_util.h" | 
| #endif  // defined(OS_MACOSX) | 
| -#include "remoting/base/capture_data.h" | 
| -#include "remoting/base/shared_buffer_factory.h" | 
| -#include "remoting/host/host_mock_objects.h" | 
| -#include "remoting/protocol/protocol_mock_objects.h" | 
| +#include "remoting/capturer/capture_data.h" | 
| +#include "remoting/capturer/capturer_mock_objects.h" | 
| +#include "remoting/capturer/shared_buffer_factory.h" | 
| #include "testing/gmock/include/gmock/gmock.h" | 
| #include "testing/gtest/include/gtest/gtest.h" | 
|  | 
| @@ -66,7 +65,7 @@ TEST_F(VideoFrameCapturerTest, Capture) { | 
| // Assume that Start() treats the screen as invalid initially. | 
| EXPECT_CALL(delegate_, | 
| OnCaptureCompleted(DirtyRegionIsNonEmptyRect())); | 
| -  EXPECT_CALL(delegate_, OnCursorShapeChangedPtr(_)) | 
| +  EXPECT_CALL(delegate_, OnCursorShapeChanged(_)) | 
| .Times(AnyNumber()); | 
|  | 
| capturer_ = VideoFrameCapturer::Create(); | 
| @@ -80,7 +79,7 @@ TEST_F(VideoFrameCapturerTest, Capture) { | 
| TEST_F(VideoFrameCapturerTest, UseSharedBuffers) { | 
| EXPECT_CALL(delegate_, | 
| OnCaptureCompleted(DirtyRegionIsNonEmptyRect())); | 
| -  EXPECT_CALL(delegate_, OnCursorShapeChangedPtr(_)) | 
| +  EXPECT_CALL(delegate_, OnCursorShapeChanged(_)) | 
| .Times(AnyNumber()); | 
|  | 
| EXPECT_CALL(shared_buffer_factory_, CreateSharedBuffer(_)) | 
|  |