HTML Media Capture: update capture attribute to use string.

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 88 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();
 
-  // 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);
+  ScopedJavaLocalRef<jstring> capture_value;
+  std::vector<base::string16> accept_types;
 
-  if (params)
-    accept_types = *(reinterpret_cast<AcceptTypes*>(params));
+  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, accept_types.back());
+    base::android::CheckException(env);
+    accept_types.pop_back();
+  } else {
+    capture_value = base::android::ConvertUTF8ToJavaString(env, "environment");
+  }
 
   ScopedJavaLocalRef<jobjectArray> accept_types_java =
-      base::android::ToJavaArrayOfStrings(env, accept_types.first);
+      base::android::ToJavaArrayOfStrings(env, accept_types);
 
   bool accept_multiple_files = SelectFileDialog::SELECT_OPEN_MULTI_FILE == type;
 
   Java_SelectFileDialog_selectFile(env, java_object_, accept_types_java,
-                                   accept_types.second, accept_multiple_files,
+                                   capture_value, accept_multiple_files,
                                    owning_window->GetJavaObject());
 }
 
 bool SelectFileDialogImpl::RegisterSelectFileDialog(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 SelectFileDialogImpl::~SelectFileDialogImpl() {
 }
 
 SelectFileDialogImpl::SelectFileDialogImpl(Listener* listener,
                                            SelectFilePolicy* policy)
     : SelectFileDialog(listener, policy) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_object_.Reset(
       Java_SelectFileDialog_create(env, reinterpret_cast<intptr_t>(this)));
 }
 
 bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
   NOTIMPLEMENTED();
   return false;
 }
 
 SelectFileDialog* CreateSelectFileDialog(SelectFileDialog::Listener* listener,
                                          SelectFilePolicy* policy) {
   return SelectFileDialogImpl::Create(listener, policy);
 }
 
 }  // namespace ui