Roll libjingle+webrtc to r5397.

content/browser/renderer_host/media/desktop_capture_device_unittest.cc

 // Copyright (c) 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 "content/browser/renderer_host/media/desktop_capture_device.h"
 
 #include "base/basictypes.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
@@ skipping 101 matching lines @@
     webrtc::DesktopFrame* frame = new webrtc::BasicDesktopFrame(size);
     if (generate_inverted_frames_)
       frame = new InvertedDesktopFrame(frame);
     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_;
   int frame_index_;
   bool generate_inverted_frames_;
 };
 
 class DesktopCaptureDeviceTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     worker_pool_ = new base::SequencedWorkerPool(3, "TestCaptureThread");
@@ skipping 138 matching lines @@
   capture_device.StopAndDeAllocate();
 
   EXPECT_EQ(kTestFrameWidth1, format.frame_size.width());
   EXPECT_EQ(kTestFrameHeight1, format.frame_size.height());
   EXPECT_EQ(kFrameRate, format.frame_rate);
   EXPECT_EQ(media::PIXEL_FORMAT_ARGB, format.pixel_format);
   worker_pool_->FlushForTesting();
 }
 
 }  // namespace content