Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / shaped_desktop_capturer_unittest.cc

diff --git a/src/remoting/host/shaped_desktop_capturer_unittest.cc b/src/remoting/host/shaped_desktop_capturer_unittest.cc
index d0acc3d..dbe353e 100644 (file)
--- a/src/remoting/host/shaped_desktop_capturer_unittest.cc
+++ b/src/remoting/host/shaped_desktop_capturer_unittest.cc
@@ -16,7 +16,7 @@ namespace remoting {
 class FakeDesktopShapeTracker : public DesktopShapeTracker {
  public:
   FakeDesktopShapeTracker() {}
-  virtual ~FakeDesktopShapeTracker() {}
+  ~FakeDesktopShapeTracker() override {}
 
   static webrtc::DesktopRegion CreateShape() {
     webrtc::DesktopRegion result;
@@ -25,11 +25,9 @@ class FakeDesktopShapeTracker : public DesktopShapeTracker {
     return result;
   }
 
-  virtual void RefreshDesktopShape() OVERRIDE {
-    shape_ = CreateShape();
-  }
+  void RefreshDesktopShape() override { shape_ = CreateShape(); }
 
-  virtual const webrtc::DesktopRegion& desktop_shape() OVERRIDE {
+  const webrtc::DesktopRegion& desktop_shape() override {
     // desktop_shape() can't be called before RefreshDesktopShape().
     EXPECT_FALSE(shape_.is_empty());
     return shape_;
@@ -43,11 +41,11 @@ class ShapedDesktopCapturerTest : public testing::Test,
                                  public webrtc::DesktopCapturer::Callback {
  public:
   // webrtc::DesktopCapturer::Callback interface
-  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE {
+  webrtc::SharedMemory* CreateSharedMemory(size_t size) override {
     return NULL;
   }
 
-  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE {
+  void OnCaptureCompleted(webrtc::DesktopFrame* frame) override {
     last_frame_.reset(frame);
   }
 
@@ -57,8 +55,8 @@ class ShapedDesktopCapturerTest : public testing::Test,
 // Verify that captured frame have shape.
 TEST_F(ShapedDesktopCapturerTest, Basic) {
   ShapedDesktopCapturer capturer(
-      scoped_ptr<webrtc::DesktopCapturer>(new FakeDesktopCapturer()),
-      scoped_ptr<DesktopShapeTracker>(new FakeDesktopShapeTracker()));
+      make_scoped_ptr(new FakeDesktopCapturer()),
+      make_scoped_ptr(new FakeDesktopShapeTracker()));
   capturer.Start(this);
   capturer.Capture(webrtc::DesktopRegion());
   ASSERT_TRUE(last_frame_.get());