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

chrome/browser/extensions/api/file_system/file_system_api.cc

Index: chrome/browser/extensions/api/file_system/file_system_api.cc
===================================================================
--- chrome/browser/extensions/api/file_system/file_system_api.cc	(revision 191470)
+++ chrome/browser/extensions/api/file_system/file_system_api.cc	(working copy)
@@ -417,13 +417,10 @@
 
     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,
@@ -449,8 +446,8 @@
   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,