Deprecate more old filepath functions.

webkit/tools/test_shell/test_shell_gtk.cc

 // Copyright (c) 2006-2008 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 "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 473 matching lines @@
   // This function is used on Windows to re-layout the window on a resize.
   // GTK manages layout for us so we do nothing.
 }
 
 /* static */ void TestShell::DumpAllBackForwardLists(std::wstring* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();
        iter != TestShell::windowList()->end(); iter++) {
     GtkWindow* window = *iter;
     TestShell* shell =
-        static_cast<TestShell*>(g_object_get_data(G_OBJECT(window), "test-shell"));
+        static_cast<TestShell*>(g_object_get_data(G_OBJECT(window),
+                                                  "test-shell"));
     shell->DumpBackForwardList(result);
   }
 }
 
 /* static */ bool TestShell::RunFileTest(const TestParams& params) {
   // Load the test file into the first available window.
   if (TestShell::windowList()->empty()) {
     LOG(ERROR) << "No windows open.";
     return false;
   }
 
   GtkWindow* window = *(TestShell::windowList()->begin());
   TestShell* shell =
-      static_cast<TestShell*>(g_object_get_data(G_OBJECT(window), "test-shell"));
+      static_cast<TestShell*>(g_object_get_data(G_OBJECT(window),
+                                                "test-shell"));
 
   // Clear focus between tests.
   shell->m_focusedWidgetHost = NULL;
 
   // Make sure the previous load is stopped.
   shell->webView()->mainFrame()->stopLoading();
   shell->navigation_controller()->Reset();
 
   // StopLoading may update state maintained in the test controller (for
   // example, whether the WorkQueue is frozen) as such, we need to reset it
@@ skipping 44 matching lines @@
   } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
 
   navigation_controller_->LoadEntry(
       new TestNavigationEntry(-1, url, std::wstring(), frame_name));
 }
 
-// TODO(agl): PromptForSaveFile should use FilePath
 bool TestShell::PromptForSaveFile(const wchar_t* prompt_title,
-                                  std::wstring* result) {
+                                  FilePath* result) {
   GtkWidget* dialog;
   dialog = gtk_file_chooser_dialog_new(WideToUTF8(prompt_title).c_str(),
                                        GTK_WINDOW(m_mainWnd),
                                        GTK_FILE_CHOOSER_ACTION_SAVE,
                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                        GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                                        NULL);  // Terminate (button, id) pairs.
   gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
                                                  TRUE);
   int dialog_result = gtk_dialog_run(GTK_DIALOG(dialog));
   if (dialog_result != GTK_RESPONSE_ACCEPT) {
     gtk_widget_destroy(dialog);
     return false;
   }
   char* path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
   gtk_widget_destroy(dialog);
-  *result = UTF8ToWide(path);
+  *result = FilePath(path);
   g_free(path);
   return true;
 }
 
 // static
 std::string TestShell::RewriteLocalUrl(const std::string& url) {
   // Convert file:///tmp/LayoutTests urls to the actual location on disk.
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
@@ skipping 50 matching lines @@
       break;
   }
   return TestShell::NetResourceProvider(resource_id);
 }
 
 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
 }
 
 }  // namespace webkit_glue