| Index: remoting/test/test_video_renderer.h
|
| diff --git a/remoting/test/test_video_renderer.h b/remoting/test/test_video_renderer.h
|
| index b9a84f7ff697e02520984054ba5366c7b7fb9b7b..1e0cba92b73d79b5fa8045c3eff1891f0972b64d 100644
|
| --- a/remoting/test/test_video_renderer.h
|
| +++ b/remoting/test/test_video_renderer.h
|
| @@ -23,11 +23,11 @@ class DesktopFrame;
|
| class DesktopRect;
|
| }
|
|
|
| -typedef uint32 RgbaColor;
|
| -
|
| namespace remoting {
|
| namespace test {
|
|
|
| +typedef uint32_t RGBA32;
|
| +
|
| // Processes video packets as they are received from the remote host. Must be
|
| // used from a thread running a message loop and this class will use that
|
| // message loop to execute the done callbacks passed by the caller of
|
| @@ -49,8 +49,8 @@ class TestVideoRenderer : public VideoRenderer, public protocol::VideoStub {
|
| // Initialize a decoder to decode video packets.
|
| void SetCodecForDecoding(const protocol::ChannelConfig::Codec codec);
|
|
|
| - // Returns a copy of the current buffer.
|
| - scoped_ptr<webrtc::DesktopFrame> GetBufferForTest() const;
|
| + // Returns a copy of the current frame.
|
| + scoped_ptr<webrtc::DesktopFrame> GetCurrentFrameForTest() const;
|
|
|
| // Gets a weak pointer for this object.
|
| base::WeakPtr<TestVideoRenderer> GetWeakPtr() {
|
| @@ -61,7 +61,7 @@ class TestVideoRenderer : public VideoRenderer, public protocol::VideoStub {
|
| // when the pattern is matched.
|
| void SetImagePatternAndMatchedCallback(
|
| const webrtc::DesktopRect& expected_rect,
|
| - const RgbaColor& expected_color,
|
| + RGBA32 expected_color,
|
| const base::Closure& image_pattern_matched_callback);
|
|
|
| private:
|
|
|