Roll libjingle+webrtc to r5397.

chrome/browser/media/native_desktop_media_list_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 "chrome/browser/media/native_desktop_media_list.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
@@ skipping 33 matching lines @@
         new webrtc::BasicDesktopFrame(webrtc::DesktopSize(10, 10));
     memset(frame->data(), 0, frame->stride() * frame->size().height());
     callback_->OnCaptureCompleted(frame);
   }
 
   virtual void SetMouseShapeObserver(
       MouseShapeObserver* mouse_shape_observer) OVERRIDE {
     NOTIMPLEMENTED();
   }
 
+  virtual bool GetScreenList(ScreenList* screens) OVERRIDE {
+    return false;
+  }
+
+  virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE {
+    return false;
+  }
+
  protected:
   Callback* callback_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeScreenCapturer);
 };
 
 class FakeWindowCapturer : public webrtc::WindowCapturer {
  public:
   FakeWindowCapturer()
       : callback_(NULL) {
@@ skipping 371 matching lines @@
   EXPECT_CALL(observer_, OnSourceThumbnailChanged(1))
     .WillOnce(QuitMessageLoop(&message_loop_));
 
   // Update frame for the window and verify that we get notification about it.
   window_capturer_->SetNextFrameValue(0, 1);
 
   message_loop_.Run();
 }
 
 }  // namespace