Update the HTML Media Capture implementation.

content/public/common/file_chooser_params.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_FILE_CHOOSER_PARAMS_H_
 #define CONTENT_PUBLIC_COMMON_FILE_CHOOSER_PARAMS_H_
 
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/string16.h"
 #include "content/common/content_export.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 
 namespace content {
 
 // Struct used by WebContentsDelegate.
 struct CONTENT_EXPORT FileChooserParams {
   FileChooserParams();
   ~FileChooserParams();
 
   enum Mode {
     // Requires that the file exists before allowing the user to pick it.
@@ skipping 17 matching lines @@
   string16 title;
 
   // Default file name to select in the dialog.
   base::FilePath default_file_name;
 
   // A list of valid lower-cased MIME types or file extensions specified in an
   // input element. It is used to restrict selectable files to such types.
   std::vector<string16> accept_types;
 
 #if defined(OS_ANDROID)
-  // Used to select items other than files, i.e. camera/mic. See
-  // SelectFileDialog.java for more details.
+  // See http://www.w3.org/TR/html-media-capture for more information.
+  // If true, the data should be obtained using the device's camera/mic/etc.

[joth, 2013/05/15 20:03:59]

nit: position this comment inside the #if below immediately above the var
declaration

   // TODO(jrg): upstream SelectFileDialog.java!  Currently lives in chrome/.

[joth, 2013/05/15 20:03:59]

this TODO is obsolete and can go. (FTR - that file is now in
ui/android/java/src/org/chromium/ui/SelectFileDialog.java)

+#if defined(NEW_MEDIA_CAPTURE_IMPLEMENTATION)

[joth, 2013/05/15 20:03:59]

rather than spluging usage of this marco all over the code, how about:
- unconditionally change this struct to have a bool
- in content/renderer/render_view_impl.cc where the 'capture' value is copied
over, put one piece of #if conditional code there that knows how to deal with
the legacy case (i.e. if the old capture string is not empty, synthesize the
bool and accept values as appropriate)
- in the rest of this patch, you'd then just include the code to do it the new
way.

btw do you have a link to the blink patch? It's hard to read this one-sided

+  bool capture;
+#else
   string16 capture;
 #endif
+#endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_FILE_CHOOSER_PARAMS_H_