Merge 88759 - CrOS - Fix crash when pressing Enter in file browser dialog

chrome/browser/extensions/extension_file_browser_private_api.cc

 // Copyright (c) 2011 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/extension_file_browser_private_api.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 798 matching lines @@
     if (contents)
       tab_id = ExtensionTabUtil::GetTabId(contents);
   }
   return tab_id;
 }
 
 const FileDialogFunction::Callback& FileDialogFunction::GetCallback() const {
   return Callback::Find(GetTabId());
 }
 
+void FileDialogFunction::RemoveCallback() {
+  // Listeners expect to be invoked exactly once, so we need to remove our
+  // callback objects afterwards.
+  Callback::Remove(GetTabId());
+}
+
 // GetFileSystemRootPathOnFileThread can only be called from the file thread,
 // so here we are. This function takes a vector of virtual paths, converts
 // them to local paths and calls GetLocalPathsResponseOnUIThread with the
 // result vector, on the UI thread.
 void FileDialogFunction::GetLocalPathsOnFileThread(const UrlList& file_urls,
                                                    const std::string& task_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   FilePathList selected_files;
 
   // FilePath(virtual_path) doesn't work on win, so limit this to ChromeOS.
@@ skipping 66 matching lines @@
     return;
   }
   int index;
   args_->GetInteger(1, &index);
   const Callback& callback = GetCallback();
   DCHECK(!callback.IsNull());
   if (!callback.IsNull()) {
     callback.listener()->FileSelected(files[0],
                                       index,
                                       callback.params());
+    RemoveCallback();  // Listeners expect to be invoked exactly once.
   }
   SendResponse(true);
 }
 
 
 ViewFilesFunction::ViewFilesFunction() {
 }
 
 ViewFilesFunction::~ViewFilesFunction() {
 }
@@ skipping 74 matching lines @@
 }
 
 void SelectFilesFunction::GetLocalPathsResponseOnUIThread(
     const FilePathList& files, const std::string& internal_task_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const Callback& callback = GetCallback();
   DCHECK(!callback.IsNull());
   if (!callback.IsNull()) {
     callback.listener()->MultiFilesSelected(files, callback.params());
+    RemoveCallback();  // Listeners expect to be invoked exactly once.
   }
   SendResponse(true);
 }
 
 bool CancelFileDialogFunction::RunImpl() {
   const Callback& callback = GetCallback();
   DCHECK(!callback.IsNull());
   if (!callback.IsNull()) {
     callback.listener()->FileSelectionCanceled(callback.params());
+    RemoveCallback();  // Listeners expect to be invoked exactly once.
   }
   SendResponse(true);
   return true;
 }
 
 bool FileDialogStringsFunction::RunImpl() {
   result_.reset(new DictionaryValue());
   DictionaryValue* dict = reinterpret_cast<DictionaryValue*>(result_.get());
 
 #define SET_STRING(ns, id) \
@@ skipping 71 matching lines @@
 #undef SET_STRING
 
   // TODO(serya): Create a new string in .grd file for this one in M13.
   dict->SetString("PREVIEW_IMAGE",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
   dict->SetString("PLAY_MEDIA",
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
 
   return true;
 }