Replace FilePath with base::FilePath in some more top level directories.

sync/test/local_sync_test_server.cc

Index: sync/test/local_sync_test_server.cc
diff --git a/sync/test/local_sync_test_server.cc b/sync/test/local_sync_test_server.cc
index 21eaf6e82fdff5ff9a4e1de5f4b2817bc83eab4a..a11234f340d0dfd1a87e55b7a124d8efe592809c 100644
--- a/sync/test/local_sync_test_server.cc
+++ b/sync/test/local_sync_test_server.cc
@@ -16,13 +16,13 @@ namespace syncer {
 LocalSyncTestServer::LocalSyncTestServer()
     : LocalTestServer(net::TestServer::TYPE_HTTP,  // Sync uses the HTTP scheme.
                       net::TestServer::kLocalhost,
-                      FilePath()),
+                      base::FilePath()),
       xmpp_port_(0) {}
 
 LocalSyncTestServer::LocalSyncTestServer(uint16 port, uint16 xmpp_port)
     : LocalTestServer(net::TestServer::TYPE_HTTP,  // Sync uses the HTTP scheme.
                       net::TestServer::kLocalhost,
-                      FilePath()),
+                      base::FilePath()),
       xmpp_port_(xmpp_port) {
   SetPort(port);
 }
@@ -40,8 +40,9 @@ bool LocalSyncTestServer::AddCommandLineArguments(
   return true;
 }
 
-bool LocalSyncTestServer::GetTestServerPath(FilePath* testserver_path) const {
-  FilePath testserver_dir;
+bool LocalSyncTestServer::GetTestServerPath(
+    base::FilePath* testserver_path) const {
+  base::FilePath testserver_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
@@ -56,9 +57,9 @@ bool LocalSyncTestServer::GetTestServerPath(FilePath* testserver_path) const {
 }
 
 bool LocalSyncTestServer::GetTestScriptPath(
-    const FilePath::StringType& test_script_name,
-    FilePath* test_script_path) const {
-  FilePath testserver_path;
+    const base::FilePath::StringType& test_script_name,
+    base::FilePath* test_script_path) const {
+  base::FilePath testserver_path;
   if (!GetTestServerPath(&testserver_path))
     return false;
   *test_script_path = testserver_path.DirName().Append(test_script_name);
@@ -71,7 +72,7 @@ bool LocalSyncTestServer::SetPythonPath() const {
 
   // Add the net/tools/testserver directory to the path, so that testserver_base
   // can be imported.
-  FilePath net_testserver_path;
+  base::FilePath net_testserver_path;
   if (!LocalTestServer::GetTestServerPath(&net_testserver_path)) {
     LOG(ERROR) << "Failed to get net testserver path.";
     return false;
@@ -79,7 +80,7 @@ bool LocalSyncTestServer::SetPythonPath() const {
   AppendToPythonPath(net_testserver_path.DirName());
 
   // Locate the Python code generated by the sync protocol buffers compiler.
-  FilePath pyproto_dir;
+  base::FilePath pyproto_dir;
   if (!GetPyProtoPath(&pyproto_dir)) {
     LOG(WARNING) << "Cannot find pyproto dir for generated code. "
                  << "Testserver features that rely on it will not work";