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

Review URL: https://codereview.chromium.org/12211108

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181639 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 21 insertions, 21 deletions

diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
index 0906152..615704a 100644
--- a/ipc/ipc_channel_posix.cc
+++ b/ipc/ipc_channel_posix.cc
@@ -170,8 +170,8 @@ bool CreateServerUnixDomainSocket(const std::string& pipe_name,
   unlink(pipe_name.c_str());
 
   // Make sure the path we need exists.
-  FilePath path(pipe_name);
-  FilePath dir_path = path.DirName();
+  base::FilePath path(pipe_name);
+  base::FilePath dir_path = path.DirName();
   if (!file_util::CreateDirectory(dir_path)) {
     if (HANDLE_EINTR(close(fd)) < 0)
       PLOG(ERROR) << "close " << pipe_name;
@@ -738,7 +738,7 @@ void Channel::ChannelImpl::ResetToAcceptingConnectionState() {
 // static
 bool Channel::ChannelImpl::IsNamedServerInitialized(
     const std::string& channel_id) {
-  return file_util::PathExists(FilePath(channel_id));
+  return file_util::PathExists(base::FilePath(channel_id));
 }
 
 #if defined(OS_LINUX)
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc
index 56549f1..cdf54da 100644
--- a/ipc/ipc_channel_posix_unittest.cc
+++ b/ipc/ipc_channel_posix_unittest.cc
@@ -110,7 +110,7 @@ private:
 
 const std::string IPCChannelPosixTest::GetChannelDirName() {
 #if defined(OS_ANDROID)
-  FilePath tmp_dir;
+  base::FilePath tmp_dir;
   PathService::Get(base::DIR_CACHE, &tmp_dir);
   return tmp_dir.value();
 #else
@@ -155,8 +155,8 @@ void IPCChannelPosixTest::SetUpSocket(IPC::ChannelHandle *handle,
     // Only one server at a time. Cleanup garbage if it exists.
     unlink(name.c_str());
     // Make sure the path we need exists.
-    FilePath path(name);
-    FilePath dir_path = path.DirName();
+    base::FilePath path(name);
+    base::FilePath dir_path = path.DirName();
     ASSERT_TRUE(file_util::CreateDirectory(dir_path));
     ASSERT_GE(bind(socket_fd,
                    reinterpret_cast<struct sockaddr *>(&server_address),
@@ -377,7 +377,7 @@ TEST_F(IPCChannelPosixTest, IsNamedServerInitialized) {
   const std::string& connection_socket_name = GetConnectionSocketName();
   IPCChannelPosixTestListener listener(false);
   IPC::ChannelHandle chan_handle(connection_socket_name);
-  ASSERT_TRUE(file_util::Delete(FilePath(connection_socket_name), false));
+  ASSERT_TRUE(file_util::Delete(base::FilePath(connection_socket_name), false));
   ASSERT_FALSE(IPC::Channel::IsNamedServerInitialized(
       connection_socket_name));
   IPC::Channel channel(chan_handle, IPC::Channel::MODE_NAMED_SERVER, &listener);
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index a4beb0e..c2191ce 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -488,18 +488,18 @@ void ParamTraits<base::FileDescriptor>::Log(const param_type& p,
 }
 #endif  // defined(OS_POSIX)
 
-void ParamTraits<FilePath>::Write(Message* m, const param_type& p) {
+void ParamTraits<base::FilePath>::Write(Message* m, const param_type& p) {
   p.WriteToPickle(m);
 }
 
-bool ParamTraits<FilePath>::Read(const Message* m,
-                                 PickleIterator* iter,
-                                 param_type* r) {
+bool ParamTraits<base::FilePath>::Read(const Message* m,
+                                       PickleIterator* iter,
+                                       param_type* r) {
   return r->ReadFromPickle(iter);
 }
 
-void ParamTraits<FilePath>::Log(const param_type& p, std::string* l) {
-  ParamTraits<FilePath::StringType>::Log(p.value(), l);
+void ParamTraits<base::FilePath>::Log(const param_type& p, std::string* l) {
+  ParamTraits<base::FilePath::StringType>::Log(p.value(), l);
 }
 
 void ParamTraits<ListValue>::Write(Message* m, const param_type& p) {
diff --git a/ipc/ipc_message_utils_unittest.cc b/ipc/ipc_message_utils_unittest.cc
index f9cb553..47e4a60 100644
--- a/ipc/ipc_message_utils_unittest.cc
+++ b/ipc/ipc_message_utils_unittest.cc
@@ -55,19 +55,19 @@ TEST(IPCMessageUtilsTest, NestedMessages) {
 
 // Tests that detection of various bad parameters is working correctly.
 TEST(IPCMessageUtilsTest, ParameterValidation) {
-  FilePath::StringType ok_string(FILE_PATH_LITERAL("hello"), 5);
-  FilePath::StringType bad_string(FILE_PATH_LITERAL("hel\0o"), 5);
+  base::FilePath::StringType ok_string(FILE_PATH_LITERAL("hello"), 5);
+  base::FilePath::StringType bad_string(FILE_PATH_LITERAL("hel\0o"), 5);
 
   // Change this if ParamTraits<FilePath>::Write() changes.
   IPC::Message message;
-  ParamTraits<FilePath::StringType>::Write(&message, ok_string);
-  ParamTraits<FilePath::StringType>::Write(&message, bad_string);
+  ParamTraits<base::FilePath::StringType>::Write(&message, ok_string);
+  ParamTraits<base::FilePath::StringType>::Write(&message, bad_string);
 
   PickleIterator iter(message);
-  FilePath ok_path;
-  FilePath bad_path;
-  ASSERT_TRUE(ParamTraits<FilePath>::Read(&message, &iter, &ok_path));
-  ASSERT_FALSE(ParamTraits<FilePath>::Read(&message, &iter, &bad_path));
+  base::FilePath ok_path;
+  base::FilePath bad_path;
+  ASSERT_TRUE(ParamTraits<base::FilePath>::Read(&message, &iter, &ok_path));
+  ASSERT_FALSE(ParamTraits<base::FilePath>::Read(&message, &iter, &bad_path));
 }
 
 }  // namespace