Remove WebFileChooserParams::initialValue

content/renderer/pepper/pepper_file_chooser_host.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 "content/renderer/pepper/pepper_file_chooser_host.h"
 
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/common/file_chooser_params.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
 #include "content/renderer/render_view_impl.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebFileChooserCompletion.h"
-#include "third_party/WebKit/public/web/WebFileChooserParams.h"
 
 namespace content {
 
 class PepperFileChooserHost::CompletionHandler
     : public blink::WebFileChooserCompletion {
  public:
   explicit CompletionHandler(const base::WeakPtr<PepperFileChooserHost>& host)
       : host_(host) {}
 
   ~CompletionHandler() override {}
@@ skipping 95 matching lines @@
     const std::vector<std::string>& accept_mime_types) {
   if (handler_)
     return PP_ERROR_INPROGRESS;  // Already pending.
 
   if (!host()->permissions().HasPermission(
           ppapi::PERMISSION_BYPASS_USER_GESTURE) &&
       !renderer_ppapi_host_->HasUserGesture(pp_instance())) {
     return PP_ERROR_NO_USER_GESTURE;
   }
 
-  blink::WebFileChooserParams params;
+  FileChooserParams params;
   if (save_as) {
-    params.saveAs = true;
-    params.initialValue = blink::WebString::fromUTF8(
-        suggested_file_name.data(), suggested_file_name.size());
+    params.mode = FileChooserParams::Save;
+    params.default_file_name =
+        base::FilePath::FromUTF8Unsafe(suggested_file_name).BaseName();
   } else {
-    params.multiSelect = open_multiple;
+    params.mode = open_multiple ? FileChooserParams::OpenMultiple
+                                : FileChooserParams::Open;
   }
-  std::vector<blink::WebString> mime_types(accept_mime_types.size());
-  for (size_t i = 0; i < accept_mime_types.size(); i++) {
-    mime_types[i] = blink::WebString::fromUTF8(accept_mime_types[i].data(),
-                                               accept_mime_types[i].size());
-  }
-  params.acceptTypes = mime_types;
-  params.directory = false;
-  params.needLocalPath = true;
+  params.accept_types.reserve(accept_mime_types.size());
+  for (const auto& mime_type : accept_mime_types)
+    params.accept_types.push_back(base::UTF8ToUTF16(mime_type));
+  params.need_local_path = true;
+
   params.requestor = renderer_ppapi_host_->GetDocumentURL(pp_instance());
 
   handler_ = new CompletionHandler(AsWeakPtr());
   RenderFrameImpl* render_frame = static_cast<RenderFrameImpl*>(
       renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance()));
 
-  if (!render_frame || !render_frame->runFileChooser(params, handler_)) {
+  if (!render_frame || !render_frame->ScheduleFileChooser(params, handler_)) {
     delete handler_;
     handler_ = NULL;
     return PP_ERROR_NOACCESS;
   }
 
   reply_context_ = context->MakeReplyMessageContext();
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PepperFileChooserHost::DidCreateResourceHosts(
@@ skipping 16 matching lines @@
   }
 
   reply_context_.params.set_result(PP_OK);
   host()->SendReply(reply_context_,
                     PpapiPluginMsg_FileChooser_ShowReply(chosen_files));
   reply_context_ = ppapi::host::ReplyMessageContext();
   handler_ = NULL;  // Handler deletes itself.
 }
 
 }  // namespace content