estade@ review feedback on r175674

ui/base/dialogs/gtk/select_file_dialog_impl_gtk.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 <gtk/gtk.h>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "ui/base/dialogs/gtk/select_file_dialog_impl.h"
 #include "ui/base/dialogs/select_file_dialog.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Makes sure that .jpg also shows .JPG. |data| is a std::string* in disguise.
 gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
                                    gpointer data) {

[Evan Stade, 2013/01/10 20:21:32]

for some reason you didn't update this

[Dan Beam, 2013/01/11 00:09:00]

Done.

   std::string* file_extension = reinterpret_cast<std::string*>(data);
   return EndsWith(file_info->filename, *file_extension, false);
 }
 
 // Deletes |data| when gtk_file_filter_add_custom() is done with it.
 void OnFileFilterDataDestroyed(gpointer data) {
   delete reinterpret_cast<std::string*>(data);
 }
 
 // Implementation of SelectFileDialog that shows a Gtk common dialog for
@@ skipping 193 matching lines @@
 void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {
   for (size_t i = 0; i < file_types_.extensions.size(); ++i) {
     GtkFileFilter* filter = NULL;
     std::set<std::string> fallback_labels;
 
     for (size_t j = 0; j < file_types_.extensions[i].size(); ++j) {
       const std::string& current_extension = file_types_.extensions[i][j];
       if (!current_extension.empty()) {
         if (!filter)
           filter = gtk_file_filter_new();
-        // |file_extension| is freed in |OnFileFilterDataDestroyed()|.
-        std::string* file_extension = new std::string("." + current_extension);
+        scoped_ptr<std::string> file_extension(
+            new std::string("." + current_extension));
+        fallback_labels.insert(std::string("*").append(*file_extension));
         gtk_file_filter_add_custom(filter,
                                    GTK_FILE_FILTER_FILENAME,
                                    &FileFilterCaseInsensitive,
-                                   reinterpret_cast<gpointer>(file_extension),
+                                   file_extension.release(),
                                    &OnFileFilterDataDestroyed);
-        fallback_labels.insert(std::string("*").append(*file_extension));
       }
     }
     // We didn't find any non-empty extensions to filter on.
     if (!filter)
       continue;
 
     // The description vector may be blank, in which case we are supposed to
     // use some sort of default description based on the filter.
     if (i < file_types_.extension_description_overrides.size()) {
       gtk_file_filter_set_name(filter, UTF16ToUTF8(
@@ skipping 310 matching lines @@
 }  // namespace
 
 namespace ui {
 
 SelectFileDialogImpl* SelectFileDialogImpl::NewSelectFileDialogImplGTK(
     Listener* listener, ui::SelectFilePolicy* policy) {
   return new SelectFileDialogImplGTK(listener, policy);
 }
 
 }  // namespace ui