Roll libjingle+webrtc to r5397.

remoting/host/shaped_screen_capturer_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/shaped_screen_capturer.h"
 
 #include "remoting/host/desktop_shape_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
@@ skipping 15 matching lines @@
   virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE {
     webrtc::DesktopFrame* frame = new webrtc::BasicDesktopFrame(
         webrtc::DesktopSize(kScreenSize, kScreenSize));
     memset(frame->data(), 0, frame->stride() * kScreenSize);
     callback_->OnCaptureCompleted(frame);
   }
 
   virtual void SetMouseShapeObserver(
       MouseShapeObserver* mouse_shape_observer) OVERRIDE {
   }
+  virtual bool GetScreenList(ScreenList* screens) OVERRIDE {
+    return false;
+  }
+  virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE {
+    return false;
+  }
 
  private:
   Callback* callback_;
 };
 
 class FakeDesktopShapeTracker : public DesktopShapeTracker {
  public:
   FakeDesktopShapeTracker() {}
   virtual ~FakeDesktopShapeTracker() {}
 
@@ skipping 40 matching lines @@
       scoped_ptr<DesktopShapeTracker>(new FakeDesktopShapeTracker()));
   capturer.Start(this);
   capturer.Capture(webrtc::DesktopRegion());
   ASSERT_TRUE(last_frame_.get());
   ASSERT_TRUE(last_frame_->shape());
   EXPECT_TRUE(
       FakeDesktopShapeTracker::CreateShape().Equals(*last_frame_->shape()));
 }
 
 }  // namespace remoting