BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 42 insertions, 0 deletions

diff --git a/chromium/media/capture/video/android/video_capture_device_factory_android.h b/chromium/media/capture/video/android/video_capture_device_factory_android.h
new file mode 100644
index 00000000000..5ca432a1122
--- /dev/null
+++ b/chromium/media/capture/video/android/video_capture_device_factory_android.h
@@ -0,0 +1,42 @@
+// Copyright 2014 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.
+
+#ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
+#define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
+
+#include "media/capture/video/video_capture_device_factory.h"
+
+#include <jni.h>
+
+#include "base/android/scoped_java_ref.h"
+#include "media/capture/video/video_capture_device.h"
+
+namespace media {
+
+// VideoCaptureDeviceFactory on Android. This class implements the static
+// VideoCapture methods and the factory of VideoCaptureAndroid.
+class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid
+    : public VideoCaptureDeviceFactory {
+ public:
+  static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
+  static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid(
+      int id,
+      jlong nativeVideoCaptureDeviceAndroid);
+
+  VideoCaptureDeviceFactoryAndroid() {}
+  ~VideoCaptureDeviceFactoryAndroid() override {}
+
+  scoped_ptr<VideoCaptureDevice> Create(
+      const VideoCaptureDevice::Name& device_name) override;
+  void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
+  void GetDeviceSupportedFormats(
+      const VideoCaptureDevice::Name& device,
+      VideoCaptureFormats* supported_formats) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);
+};
+}  // namespace media
+
+#endif  // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_