Rename FilePath -> base::FilePath in various toplevel directories

chrome_frame/test/test_server.h

Index: chrome_frame/test/test_server.h
diff --git a/chrome_frame/test/test_server.h b/chrome_frame/test/test_server.h
index 04da1265556ba8a278f9f7b1cb2e907ba10e8409..48fd4b7e85f4e96d4c36481a08efbef408c660b2 100644
--- a/chrome_frame/test/test_server.h
+++ b/chrome_frame/test/test_server.h
@@ -241,7 +241,7 @@ class SimpleResponse : public ResponseForPath {
 // contents of the file and performs registry lookups.
 class FileResponse : public ResponseForPath {
  public:
-  FileResponse(const char* request_path, const FilePath& file_path)
+  FileResponse(const char* request_path, const base::FilePath& file_path)
       : ResponseForPath(request_path), file_path_(file_path) {
   }
 
@@ -250,7 +250,7 @@ class FileResponse : public ResponseForPath {
   virtual size_t ContentLength() const;
 
  protected:
-  FilePath file_path_;
+  base::FilePath file_path_;
   mutable scoped_ptr<file_util::MemoryMappedFile> file_;
 
  private:
@@ -398,7 +398,8 @@ class ConfigurableConnection : public base::RefCounted<ConfigurableConnection> {
 // instance to send the response.
 class HTTPTestServer : public net::StreamListenSocket::Delegate {
  public:
-  HTTPTestServer(int port, const std::wstring& address, FilePath root_dir);
+  HTTPTestServer(int port, const std::wstring& address,
+                 base::FilePath root_dir);
   virtual ~HTTPTestServer();
 
   // HTTP GET request is received. Override in derived classes.
@@ -414,12 +415,12 @@ class HTTPTestServer : public net::StreamListenSocket::Delegate {
   // Return the appropriate url with the specified path for this server.
   std::wstring Resolve(const std::wstring& path);
 
-  FilePath root_dir() { return root_dir_; }
+  base::FilePath root_dir() { return root_dir_; }
 
  protected:
   int port_;
   std::wstring address_;
-  FilePath root_dir_;
+  base::FilePath root_dir_;
 
  private:
   typedef std::list<scoped_refptr<ConfigurableConnection> > ConnectionList;