Add FilePath to base namespace.

webkit/tools/test_shell/test_shell_win.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 <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <process.h>
@@ skipping 83 matching lines @@
   // Warning: Don't use the heap in this function.  It may be corrupted.
   if (!g_currentTestName[0])
     return false;
 
   // Try to rename the minidump file to include the crashed test's name.
   // StackString uses the stack but overflows onto the heap.  But we don't
   // care too much about being completely correct here, since most crashes
   // will be happening on developers' machines where they have debuggers.
   base::StackString16<kPathBufSize * 2> origPath;
   origPath->append(dumpPath);
-  origPath->push_back(FilePath::kSeparators[0]);
+  origPath->push_back(base::FilePath::kSeparators[0]);
   origPath->append(minidumpID);
   origPath->append(L".dmp");
 
   base::StackString16<kPathBufSize * 2> newPath;
   newPath->append(dumpPath);
-  newPath->push_back(FilePath::kSeparators[0]);
+  newPath->push_back(base::FilePath::kSeparators[0]);
   newPath->append(g_currentTestName);
   newPath->append(L"-");
   newPath->append(minidumpID);
   newPath->append(L".dmp");
 
   // May use the heap, but oh well.  If this fails, we'll just have the
   // original dump file lying around.
   _wrename(origPath->c_str(), newPath->c_str());
 
   return false;
 }
 
 // Helper method for getting the path to the test shell resources directory.
-FilePath GetResourcesFilePath() {
-  FilePath path;
+base::FilePath GetResourcesFilePath() {
+  base::FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("webkit");
   path = path.AppendASCII("tools");
   path = path.AppendASCII("test_shell");
   return path.AppendASCII("resources");
 }
 
 static base::StringPiece GetRawDataResource(HMODULE module, int resource_id) {
   void* data_ptr;
   size_t data_size;
@@ skipping 108 matching lines @@
   }
 }
 
 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_url;
+    base::FilePath replace_url;
     PathService::Get(base::DIR_EXE, &replace_url);
     replace_url = replace_url.DirName();
     replace_url = replace_url.DirName();
     replace_url = replace_url.AppendASCII("third_party");
     replace_url = replace_url.AppendASCII("WebKit");
     replace_url = replace_url.AppendASCII("LayoutTests");
     string16 replace_url_str = replace_url.value();
     replace_url_str.push_back(L'/');
     new_url = std::string("file:///") +
               UTF16ToUTF8(replace_url_str).append(url.substr(kPrefixLen));
@@ skipping 368 matching lines @@
     if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {
       EndDialog(hDlg, LOWORD(wParam));
       return (INT_PTR)TRUE;
     }
     break;
   }
   return (INT_PTR)FALSE;
 }
 
 bool TestShell::PromptForSaveFile(const wchar_t* prompt_title,
-                                  FilePath* result) {
+                                  base::FilePath* result) {
   wchar_t path_buf[MAX_PATH] = L"data.txt";
 
   OPENFILENAME info = {0};
   info.lStructSize = sizeof(info);
   info.hwndOwner = m_mainWnd;
   info.hInstance = instance_handle_;
   info.lpstrFilter = L"*.txt\0";
   info.lpstrFile = path_buf;
   info.nMaxFile = arraysize(path_buf);
   info.lpstrTitle = prompt_title;
   if (!GetSaveFileName(&info))
     return false;
 
-  *result = FilePath(info.lpstrFile);
+  *result = base::FilePath(info.lpstrFile);
   return true;
 }
 
 // static
 void TestShell::ShowStartupDebuggingDialog() {
   MessageBox(NULL, L"attach to me?", L"test_shell", MB_OK);
 }
 
 // static
 base::StringPiece TestShell::ResourceProvider(int key) {
@@ skipping 14 matching lines @@
 
 // TODO(tc): Convert this to using resources from test_shell.rc.
 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();
       path = path.AppendASCII("missingImage.gif");
       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 28 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue