Reland CL to implement browser-side logging to WebRtc log.

media/video/capture/video_capture_device_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
@@ skipping 51 matching lines @@
 class MockClient : public media::VideoCaptureDevice::Client {
  public:
   MOCK_METHOD2(ReserveOutputBuffer,
                scoped_refptr<Buffer>(media::VideoFrame::Format format,
                                      const gfx::Size& dimensions));
   MOCK_METHOD0(OnErr, void());
 
   explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb)
       : main_thread_(base::MessageLoopProxy::current()), frame_cb_(frame_cb) {}
 
-  virtual void OnError() OVERRIDE {
+  virtual void OnError(const std::string& error_message) OVERRIDE {
     OnErr();
   }
 
   virtual void OnIncomingCapturedFrame(const uint8* data,
                                        int length,
                                        base::TimeTicks timestamp,
                                        int rotation,
                                        const VideoCaptureFormat& format)
       OVERRIDE {
     main_thread_->PostTask(FROM_HERE, base::Bind(frame_cb_, format));
@@ skipping 345 matching lines @@
     EXPECT_EQ(supported_formats[0].pixel_format, media::PIXEL_FORMAT_I420);
     EXPECT_GE(supported_formats[0].frame_rate, 20);
     EXPECT_EQ(supported_formats[1].frame_size.width(), 320);
     EXPECT_EQ(supported_formats[1].frame_size.height(), 240);
     EXPECT_EQ(supported_formats[1].pixel_format, media::PIXEL_FORMAT_I420);
     EXPECT_GE(supported_formats[1].frame_rate, 20);
   }
 }
 
 };  // namespace media