Update the HTML Media Capture implementation.

chrome/browser/file_select_helper.cc

Index: chrome/browser/file_select_helper.cc
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index 48cf490d550998abd1cf5135d553d7f277534b24..f3199d6451cddb5e1bba930f1c71322e4dfba1f0 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/file_select_helper.h"
 
 #include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ -27,6 +28,7 @@
 #include "content/public/common/file_chooser_params.h"
 #include "grit/generated_resources.h"
 #include "net/base/mime_util.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
@@ -414,8 +416,12 @@ void FileSelectHelper::RunFileChooserOnUIThread(
 
 #if defined(OS_ANDROID)
   // Android needs the original MIME types and an additional capture value.
-  std::vector<string16> accept_types(params.accept_types);
-  accept_types.push_back(params.capture);
+#if defined(NEW_MEDIA_CAPTURE_IMPLEMENTATION)
+  std::pair<std::vector<string16>, bool> accept_types =
+#else
+  std::pair<std::vector<string16>, string16> accept_types =
+#endif
+      std::make_pair(params.accept_types, params.capture);
 #endif
 
   select_file_dialog_->SelectFile(