Add FilePath to base namespace.

webkit/tools/test_shell/test_shell_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 "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 23 matching lines @@
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_webkit_init.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 using WebKit::WebPoint;
 using WebKit::WebWidget;
 
 namespace {
 
-// Convert a FilePath into an FcChar* (used by fontconfig).
+// Convert a base::FilePath into an FcChar* (used by fontconfig).
 // The pointer only lives for the duration for the expression.
-const FcChar8* FilePathAsFcChar(const FilePath& path) {
+const FcChar8* FilePathAsFcChar(const base::FilePath& path) {
   return reinterpret_cast<const FcChar8*>(path.value().c_str());
 }
 
 void TerminationSignalHandler(int signatl) {
   TestShell::ShutdownTestShell();
   exit(0);
 }
 
 // GTK callbacks ------------------------------------------------------
 
@@ skipping 95 matching lines @@
 
 // static
 void TestShell::InitializeTestShell(bool layout_test_mode,
                                     bool allow_external_pages) {
   window_list_ = new WindowList;
   layout_test_mode_ = layout_test_mode;
   allow_external_pages_ = allow_external_pages;
 
   web_prefs_ = new webkit_glue::WebPreferences;
 
-  FilePath data_path;
+  base::FilePath data_path;
   PathService::Get(base::DIR_EXE, &data_path);
   data_path = data_path.Append("test_shell.pak");
   ResourceBundle::InitSharedInstanceWithPakPath(data_path);
 
-  FilePath resources_dir;
+  base::FilePath resources_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &resources_dir);
   resources_dir = resources_dir.Append("webkit/tools/test_shell/resources");
 
   ResetWebPreferences();
 
   // We wish to make the layout tests reproducable with respect to fonts. Skia
   // uses fontconfig to resolve font family names from WebKit into actual font
   // files found on the current system. This means that fonts vary based on the
   // system and also on the fontconfig configuration.
   //
   // To avoid this we initialise fontconfig here and install a configuration
   // which only knows about a few, select, fonts.
 
   // We have fontconfig parse a config file from our resources file. This
   // sets a number of aliases ("sans"->"Arial" etc), but doesn't include any
   // font directories.
   if (layout_test_mode) {
     FcInit();
 
     FcConfig* fontcfg = FcConfigCreate();
-    FilePath fontconfig_path = resources_dir.Append("fonts.conf");
+    base::FilePath fontconfig_path = resources_dir.Append("fonts.conf");
     if (!FcConfigParseAndLoad(fontcfg, FilePathAsFcChar(fontconfig_path),
                               true)) {
       LOG(FATAL) << "Failed to parse fontconfig config file";
     }
 
     // This is the list of fonts that fontconfig will know about. It
     // will try its best to match based only on the fonts here in. The
     // paths are where these fonts are found on our Ubuntu boxes.
     static const char *const fonts[] = {
       "/usr/share/fonts/truetype/kochi/kochi-gothic.ttf",
@@ skipping 57 matching lines @@
                      << "Without this, some layout tests will fail. "
                      << "See http://code.google.com/p/chromium/wiki/"
                      << "LinuxBuildInstructionsPrerequisites for more.";
       } else {
         if (!FcConfigAppFontAddFile(fontcfg, (FcChar8 *) font))
           LOG(FATAL) << "Failed to load font " << font;
       }
     }
 
     // Also load the layout-test-specific "Ahem" font.
-    FilePath ahem_path = resources_dir.Append("AHEM____.TTF");
+    base::FilePath ahem_path = resources_dir.Append("AHEM____.TTF");
     if (!FcConfigAppFontAddFile(fontcfg, FilePathAsFcChar(ahem_path))) {
       LOG(FATAL) << "Failed to load font " << ahem_path.value().c_str();
     }
 
     if (!FcConfigSetCurrent(fontcfg))
       LOG(FATAL) << "Failed to set the default font configuration";
   }
 
   // Install an signal handler so we clean up after ourselves.
   signal(SIGINT, TerminationSignalHandler);
@@ skipping 224 matching lines @@
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
 
   navigation_controller_->LoadEntry(
       new TestNavigationEntry(-1, url, frame_name));
 }
 
 bool TestShell::PromptForSaveFile(const wchar_t* prompt_title,
-                                  FilePath* result) {
+                                  base::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 = FilePath(path);
+  *result = base::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;
 
   std::string new_url(url);
   if (url.compare(0, kPrefixLen, kPrefix, kPrefixLen) == 0) {
-    FilePath replace_path;
+    base::FilePath replace_path;
     PathService::Get(base::DIR_SOURCE_ROOT, &replace_path);
     replace_path = replace_path.Append(
         "third_party/WebKit/LayoutTests/");
     new_url = std::string("file://") + replace_path.value() +
         url.substr(kPrefixLen);
   }
 
   return new_url;
 }
 
@@ skipping 24 matching lines @@
     case IDR_BROKENIMAGE:
       resource_id = IDR_BROKENIMAGE_TESTSHELL;
       break;
     case IDR_TEXTAREA_RESIZER:
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
   }
   // TODO(flackr): Pass scale_factor.
   return TestShell::ResourceProvider(resource_id);
 }