Add FilePath to base namespace.

webkit/tools/test_shell/test_shell_mac.mm

 // 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 <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
@@ skipping 60 matching lines @@
 const int kTestWindowYLocation = -14000;
 
 // Data pack resource. This is a pointer to the mmapped resources file.
 static ui::DataPack* g_resource_data_pack = NULL;
 
 // Define static member variables
 base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> >
     TestShell::window_map_ = LAZY_INSTANCE_INITIALIZER;
 
 // Helper method for getting the path to the test shell resources directory.
-FilePath GetResourcesFilePath() {
-  FilePath path;
+base::FilePath GetResourcesFilePath() {
+  base::FilePath path;
   // We need to know if we're bundled or not to know which path to use.
   if (base::mac::AmIBundled()) {
     PathService::Get(base::DIR_EXE, &path);
-    path = path.Append(FilePath::kParentDirectory);
+    path = path.Append(base::FilePath::kParentDirectory);
     return path.AppendASCII("Resources");
   } else {
     PathService::Get(base::DIR_SOURCE_ROOT, &path);
     path = path.AppendASCII("webkit");
     path = path.AppendASCII("tools");
     path = path.AppendASCII("test_shell");
     return path.AppendASCII("resources");
   }
 }
 
@@ skipping 111 matching lines @@
 
   web_prefs_ = new webkit_glue::WebPreferences;
 
   // mmap the data pack which holds strings used by WebCore. This is only
   // a fatal error if we're bundled, which means we might be running layout
   // tests. This is a harmless failure for test_shell_tests.
   g_resource_data_pack = new ui::DataPack(ui::SCALE_FACTOR_100P);
   NSString *resource_path =
       [base::mac::FrameworkBundle() pathForResource:@"test_shell"
                                              ofType:@"pak"];
-  FilePath resources_pak_path([resource_path fileSystemRepresentation]);
+  base::FilePath resources_pak_path([resource_path fileSystemRepresentation]);
   if (!g_resource_data_pack->LoadFromPath(resources_pak_path)) {
     LOG(FATAL) << "failed to load test_shell.pak";
   }
 
   ResetWebPreferences();
 
   // Load the Ahem font, which is used by layout tests.
   NSString* ahem_path = [[base::mac::FrameworkBundle() resourcePath]
       stringByAppendingPathComponent:@"AHEM____.TTF"];
   NSURL* ahem_path_url = [NSURL fileURLWithPath:ahem_path];
   CFErrorRef error;
   if (!CTFontManagerRegisterFontsForURL((CFURLRef)ahem_path_url,
                                         kCTFontManagerScopeProcess, &error)) {
     DLOG(FATAL) << "CTFontManagerRegisterFontsForURL "
                 << [ahem_path fileSystemRepresentation]
                 << [[(NSError*)error description] UTF8String];
   }
 
   // Add <app bundle's parent dir>/plugins to the plugin path so we can load
   // test plugins.
-  FilePath plugins_dir;
+  base::FilePath plugins_dir;
   PathService::Get(base::DIR_EXE, &plugins_dir);
   if (base::mac::AmIBundled()) {
     plugins_dir = plugins_dir.AppendASCII("../../../plugins");
   } else {
     plugins_dir = plugins_dir.AppendASCII("plugins");
   }
   webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
 }
 
 NSButton* MakeTestButton(NSRect* rect, NSString* title, NSView* parent) {
@@ skipping 282 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)
 {
   NSSavePanel* save_panel = [NSSavePanel savePanel];
 
   /* set up new attributes */
   [save_panel setAllowedFileTypes:@[@"txt"]];
   [save_panel setMessage:
       [NSString stringWithUTF8String:WideToUTF8(prompt_title).c_str()]];
 
   /* display the NSSavePanel */
   [save_panel setDirectoryURL:[NSURL fileURLWithPath:NSHomeDirectory()]];
   [save_panel setNameFieldStringValue:@""];
   if ([save_panel runModal] == NSFileHandlingPanelOKButton) {
-    *result = FilePath([[[save_panel URL] path] fileSystemRepresentation]);
+    *result = base::FilePath([[[save_panel URL] path] fileSystemRepresentation]);
     return true;
   }
   return false;
 }
 
 // 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 41 matching lines @@
 }
 
 base::StringPiece TestShellWebKitInit::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
     static std::string broken_image_data;
     if (broken_image_data.empty()) {
-      FilePath path = GetResourcesFilePath();
+      base::FilePath path = GetResourcesFilePath();
       // In order to match WebKit's colors for the missing image, we have to
       // use a PNG. The GIF doesn't have the color range needed to correctly
       // match the TIFF they use in Safari.
       path = path.AppendASCII("missingImage.png");
       bool success = file_util::ReadFileToString(path, &broken_image_data);
       if (!success) {
         LOG(FATAL) << "Failed reading: " << path.value();
       }
     }
     return broken_image_data;
   }
   case IDR_TEXTAREA_RESIZER: {
     // Use webkit's text area resizer image.
     static std::string resize_corner_data;
     if (resize_corner_data.empty()) {
-      FilePath path = GetResourcesFilePath();
+      base::FilePath path = GetResourcesFilePath();
       path = path.AppendASCII("textAreaResizeCorner.png");
       bool success = file_util::ReadFileToString(path, &resize_corner_data);
       if (!success) {
         LOG(FATAL) << "Failed reading: " << path.value();
       }
     }
     return resize_corner_data;
   }
 
   case IDR_SEARCH_CANCEL:
@@ skipping 27 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue