| Index: remoting/host/desktop_session_agent.h | 
| diff --git a/remoting/host/desktop_session_agent.h b/remoting/host/desktop_session_agent.h | 
| index 96c23cc98469771a8d367d15cac15a8bfb7291ea..f80e5fbe21fa2c2fdba4e9f4b05b1cbb7ca39987 100644 | 
| --- a/remoting/host/desktop_session_agent.h | 
| +++ b/remoting/host/desktop_session_agent.h | 
| @@ -15,9 +15,9 @@ | 
| #include "base/memory/weak_ptr.h" | 
| #include "ipc/ipc_listener.h" | 
| #include "ipc/ipc_platform_file.h" | 
| -#include "remoting/base/shared_buffer.h" | 
| -#include "remoting/base/shared_buffer_factory.h" | 
| -#include "remoting/host/video_frame_capturer.h" | 
| +#include "remoting/capturer/shared_buffer.h" | 
| +#include "remoting/capturer/shared_buffer_factory.h" | 
| +#include "remoting/capturer/video_frame_capturer.h" | 
| #include "remoting/protocol/clipboard_stub.h" | 
| #include "third_party/skia/include/core/SkRect.h" | 
|  | 
| @@ -70,7 +70,7 @@ class DesktopSessionAgent | 
| virtual void OnCaptureCompleted( | 
| scoped_refptr<CaptureData> capture_data) OVERRIDE; | 
| virtual void OnCursorShapeChanged( | 
| -      scoped_ptr<protocol::CursorShapeInfo> cursor_shape) OVERRIDE; | 
| +      const MouseCursorShape& cursor_shape) OVERRIDE; | 
|  | 
| // Forwards a local clipboard event though the IPC channel to the network | 
| // process. | 
|  |