CrOS - Fix crash in file browser the second time you save a file

chrome/browser/ui/views/file_manager_dialogs.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 "base/logging.h"
 #include "chrome/browser/extensions/extension_file_browser_private_api.h"
 #include "chrome/browser/extensions/file_manager_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ skipping 68 matching lines @@
   return owner_window_ == owner_window;
 }
 
 void FileManagerDialog::ListenerDestroyed() {
   listener_ = NULL;
   FileDialogFunction::Callback::Remove(tab_id_);
 }
 
 void FileManagerDialog::ExtensionDialogIsClosing(ExtensionDialog* dialog) {
   owner_window_ = NULL;
+  FileDialogFunction::Callback::Remove(tab_id_);
 }
 
 void FileManagerDialog::SelectFileImpl(
     Type type,
     const string16& title,
     const FilePath& default_path,
     const FileTypeInfo* file_types,
     int file_type_index,
     const FilePath::StringType& default_extension,
     gfx::NativeWindow owner_window,
@@ skipping 15 matching lines @@
 
   // Connect our listener to FileDialogFunction's per-tab callbacks.
   Browser* extension_browser = dialog->host()->view()->browser();
   TabContents* contents = extension_browser->GetSelectedTabContents();
   int32 tab_id = (contents ? contents->controller().session_id().id() : 0);
   FileDialogFunction::Callback::Add(tab_id, listener_, params);
 
   tab_id_ = tab_id;
   owner_window_ = owner_window;
 }