Merge 271560 "Add a ChromeOS implementation of VideoCaptureDevic..."

media/video/capture/android/video_capture_device_android.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 "media/video/capture/android/video_capture_device_android.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 17 matching lines @@
 
 // static
 void VideoCaptureDevice::GetDeviceSupportedFormats(
     const Name& device,
     VideoCaptureFormats* capture_formats) {
   VideoCaptureDeviceFactoryAndroid::GetDeviceSupportedFormats(device,
                                                               capture_formats);
 }
 
 // static
-VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) {
+VideoCaptureDevice* VideoCaptureDevice::Create(
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+    const Name& device_name) {
   return VideoCaptureDeviceAndroid::Create(device_name);
 }
 
 // static
 VideoCaptureDevice* VideoCaptureDeviceAndroid::Create(const Name& device_name) {
   scoped_ptr<VideoCaptureDeviceAndroid> ret(
       new VideoCaptureDeviceAndroid(device_name));
   if (ret->Init())
     return ret.release();
   return NULL;
@@ skipping 170 matching lines @@
 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) {
   LOG(ERROR) << "VideoCaptureDeviceAndroid::SetErrorState: " << reason;
   {
     base::AutoLock lock(lock_);
     state_ = kError;
   }
   client_->OnError(reason);
 }
 
 }  // namespace media