Update the HTML Media Capture implementation.

ui/shell_dialogs/select_file_dialog_android.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 "select_file_dialog_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 44 matching lines @@
     SelectFileDialog::Type type,
     const base::string16& title,
     const base::FilePath& default_path,
     const SelectFileDialog::FileTypeInfo* file_types,
     int file_type_index,
     const std::string& default_extension,
     gfx::NativeWindow owning_window,
     void* params) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
-  ScopedJavaLocalRef<jstring> capture_value;
-  std::vector<base::string16> accept_types;
+  // The first element in the pair is a list of accepted types, the second
+  // indicates whether the device's capture capabilities should be used.
+  typedef std::pair<std::vector<base::string16>, bool> AcceptTypes;
+  AcceptTypes accept_types = std::make_pair(std::vector<base::string16>(),
+                                            false);
+
   if (params) {
-    accept_types = *(reinterpret_cast<std::vector<base::string16>*>(params));
-
-    // The last string in params is expected to be the string
-    // with capture value.
-    capture_value = base::android::ConvertUTF16ToJavaString(env,
-          StringToLowerASCII(accept_types.back()));
-    base::android::CheckException(env);
-    accept_types.pop_back();
-  } else {
-    capture_value = base::android::ConvertUTF8ToJavaString(env, "filesystem");
+      accept_types = *(reinterpret_cast<AcceptTypes*>(params));

[sky, 2013/07/08 21:13:51]

spacing is off here.

[Raphael Kubo da Costa (rakuco), 2013/07/08 21:27:01]

Done.

   }
 
-  // The rest params elements are expected to be accept_types.
   ScopedJavaLocalRef<jobjectArray> accept_types_java =
-      base::android::ToJavaArrayOfStrings(env, accept_types);
+      base::android::ToJavaArrayOfStrings(env, accept_types.first);
+  bool has_capture_attribute = accept_types.second;

[sky, 2013/07/08 21:13:51]

Is there a reason for the local rather then accepot_types.second below?

[Raphael Kubo da Costa (rakuco), 2013/07/08 21:27:01]

It seemed to be easier to understand that way. Would you like me to change that?

[sky, 2013/07/08 21:32:32]

I like consistency. Since you don't declare a local variable for
accept_types.first above don't for accept_types.second.

[Raphael Kubo da Costa (rakuco), 2013/07/08 21:38:12]

Done.

 
   Java_SelectFileDialog_selectFile(env, java_object_.obj(),
                                    accept_types_java.obj(),
-                                   capture_value.obj(),
+                                   has_capture_attribute,
                                    owning_window->GetJavaObject().obj());
   is_running_ = true;
 }
 
 bool SelectFileDialogImpl::RegisterSelectFileDialog(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 SelectFileDialogImpl::~SelectFileDialogImpl() {
 }
@@ skipping 11 matching lines @@
   return false;
 }
 
 SelectFileDialog* CreateAndroidSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
   return SelectFileDialogImpl::Create(listener, policy);
 }
 
 }  // namespace ui