Merge 190915 "Fix crash of chrome.fileSystem.chooseEntry on Linux."

chrome/browser/extensions/api/file_system/file_system_api.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 "chrome/browser/extensions/api/file_system/file_system_api.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 399 matching lines @@
         entry_type_(entry_type),
         function_(function) {
     select_file_dialog_ = ui::SelectFileDialog::Create(
         this, new ChromeSelectFilePolicy(web_contents));
     gfx::NativeWindow owning_window = web_contents ?
         platform_util::GetTopLevel(web_contents->GetView()->GetNativeView()) :
         NULL;
 
     if (g_skip_picker_for_test) {
       if (g_path_to_be_picked_for_test) {
-        ui::SelectedFileInfo selected_path(*g_path_to_be_picked_for_test,
-                                           base::FilePath());
         content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
             base::Bind(
-                &FileSystemChooseEntryFunction::FilePicker::
-                    FileSelectedWithExtraInfo,
-                base::Unretained(this), selected_path, 1,
+                &FileSystemChooseEntryFunction::FilePicker::FileSelected,
+                base::Unretained(this), *g_path_to_be_picked_for_test, 1,
                 static_cast<void*>(NULL)));
       } else {
         content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
             base::Bind(
                 &FileSystemChooseEntryFunction::FilePicker::
                     FileSelectionCanceled,
                 base::Unretained(this), static_cast<void*>(NULL)));
       }
       return;
     }
 
     select_file_dialog_->SelectFile(picker_type,
                                     string16(),
                                     suggested_name,
                                     &file_type_info, 0, FILE_PATH_LITERAL(""),
                                     owning_window, NULL);
   }
 
   virtual ~FilePicker() {}
 
  private:
   // ui::SelectFileDialog::Listener implementation.
   virtual void FileSelected(const base::FilePath& path,
                             int index,
                             void* params) OVERRIDE {
-    // The version taking ui::SelectedFileInfo should be used.
-    NOTREACHED();
+    function_->FileSelected(path, entry_type_);
+    delete this;
   }
 
   virtual void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file,
                                          int index,
                                          void* params) OVERRIDE {
     // Normally, file.local_path is used because it is a native path to the
     // local read-only cached file in the case of remote file system like
     // Chrome OS's Google Drive integration. Here, however, |file.file_path| is
     // necessary because we need to create a FileEntry denoting the remote file,
     // not its cache. On other platforms than Chrome OS, they are the same.
@@ skipping 181 matching lines @@
   if (entry_type == WRITABLE && !HasFileSystemWritePermission()) {
     error_ = kRequiresFileSystemWriteError;
     return false;
   }
 
   file_type_info.support_drive = true;
   return ShowPicker(suggested_name, file_type_info, picker_type, entry_type);
 }
 
 }  // namespace extensions