Index: cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc |
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc |
index 15bac4b14b3845e44aeca5101c44fec5224ff577..cc935bf04c3bc0948576c34e61034d0362779fa1 100644 |
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc |
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc |
@@ -39,13 +39,13 @@ class PortMonitorTest : public testing::Test { |
cloud_print::kCloudPrintRegKey, |
KEY_ALL_ACCESS); |
- FilePath path; |
+ base::FilePath path; |
PathService::Get(base::DIR_LOCAL_APP_DATA, &path); |
path = path.Append(kAlternateChromeExePath); |
ASSERT_EQ(ERROR_SUCCESS, |
key.WriteValue(cloud_print::kChromeExePathRegValue, |
path.value().c_str())); |
- FilePath temp; |
+ base::FilePath temp; |
PathService::Get(base::DIR_TEMP, &temp); |
// Write any dir here. |
ASSERT_EQ(ERROR_SUCCESS, |
@@ -62,21 +62,21 @@ class PortMonitorTest : public testing::Test { |
} |
virtual void CreateTempChromeExeFiles() { |
- FilePath path; |
+ base::FilePath path; |
PathService::Get(base::DIR_LOCAL_APP_DATA, &path); |
- FilePath main_path = path.Append(kChromeExePath); |
+ base::FilePath main_path = path.Append(kChromeExePath); |
ASSERT_TRUE(file_util::CreateDirectory(main_path)); |
- FilePath alternate_path = path.Append(kAlternateChromeExePath); |
+ base::FilePath alternate_path = path.Append(kAlternateChromeExePath); |
ASSERT_TRUE(file_util::CreateDirectory(alternate_path)); |
} |
virtual void DeleteTempChromeExeFiles() { |
- FilePath path; |
+ base::FilePath path; |
PathService::Get(base::DIR_LOCAL_APP_DATA, &path); |
- FilePath main_path = path.Append(kChromeExePath); |
+ base::FilePath main_path = path.Append(kChromeExePath); |
ASSERT_TRUE(file_util::Delete(main_path, true)); |
PathService::Get(base::DIR_LOCAL_APP_DATA, &path); |
- FilePath alternate_path = path.Append(kAlternateChromeExePath); |
+ base::FilePath alternate_path = path.Append(kAlternateChromeExePath); |
ASSERT_TRUE(file_util::Delete(alternate_path, true)); |
} |
@@ -95,7 +95,7 @@ class PortMonitorTest : public testing::Test { |
TEST_F(PortMonitorTest, GetChromeExePathTest) { |
CreateTempChromeExeFiles(); |
- FilePath chrome_path = cloud_print::GetChromeExePath(); |
+ base::FilePath chrome_path = cloud_print::GetChromeExePath(); |
EXPECT_FALSE(chrome_path.empty()); |
EXPECT_TRUE( |
chrome_path.value().rfind(kAlternateChromeExePath) != std::string::npos); |
@@ -108,9 +108,9 @@ TEST_F(PortMonitorTest, GetChromeExePathTest) { |
} |
TEST_F(PortMonitorTest, GetChromeProfilePathTest) { |
- FilePath data_path = cloud_print::GetChromeProfilePath(); |
+ base::FilePath data_path = cloud_print::GetChromeProfilePath(); |
EXPECT_FALSE(data_path.empty()); |
- FilePath temp; |
+ base::FilePath temp; |
PathService::Get(base::DIR_TEMP, &temp); |
EXPECT_EQ(data_path, temp); |
EXPECT_TRUE(file_util::DirectoryExists(data_path)); |