Convert FilePath to base::FilePath.

This removes the using for Windows since it is no longer necessary.

BUG=

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

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

9 files changed, 14 insertions, 14 deletions

diff --git a/chrome/browser/system_monitor/removable_device_notifications_window_win.cc b/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
index 88745af..93c1d8e 100644
--- a/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_window_win.cc
@@ -126,7 +126,7 @@ bool RemovableDeviceNotificationsWindowWin::GetDeviceInfoForPath(
 }
 
 uint64 RemovableDeviceNotificationsWindowWin::GetStorageSize(
-    const FilePath::StringType& location) const {
+    const base::FilePath::StringType& location) const {
   return volume_mount_watcher_->GetStorageSize(location);
 }
 
diff --git a/chrome/browser/system_monitor/volume_mount_watcher_win.cc b/chrome/browser/system_monitor/volume_mount_watcher_win.cc
index 121c42b..60ce509 100644
--- a/chrome/browser/system_monitor/volume_mount_watcher_win.cc
+++ b/chrome/browser/system_monitor/volume_mount_watcher_win.cc
@@ -312,7 +312,7 @@ bool VolumeMountWatcherWin::GetDeviceInfo(const base::FilePath& device_path,
 }
 
 uint64 VolumeMountWatcherWin::GetStorageSize(
-    const FilePath::StringType& mount_point) const {
+    const base::FilePath::StringType& mount_point) const {
   MountPointDeviceMetadataMap::const_iterator iter =
       device_metadata_.find(mount_point);
   if (iter != device_metadata_.end())
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index f2696d3..414b8b3 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -273,7 +273,7 @@ void AddInstallAppCommandWorkItems(const InstallerState& installer_state,
 
 void AddInstallExtensionCommandWorkItem(const InstallerState& installer_state,
                                         const InstallationState& machine_state,
-                                        const FilePath& setup_path,
+                                        const base::FilePath& setup_path,
                                         const Version& new_version,
                                         const Product& product,
                                         WorkItemList* work_item_list) {
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index c5e61d9..cb16ca1 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -422,7 +422,7 @@ void GetLocalStateFolders(const Product& product,
 }
 
 // Creates a copy of the local state file and returns a path to the copy.
-FilePath BackupLocalStateFile(
+base::FilePath BackupLocalStateFile(
     const std::vector<base::FilePath>& local_state_folders) {
   base::FilePath backup;
 
diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc
index ddfd7f5..5bec8b1 100644
--- a/chrome/installer/test/alternate_version_generator.cc
+++ b/chrome/installer/test/alternate_version_generator.cc
@@ -466,7 +466,7 @@ bool ApplyAlternateVersion(const base::FilePath& work_dir,
 // relative path "..\..\third_party\lzma_sdk\Executable" is applied to the host
 // executable's directory.  This can be overridden with the --7za_path
 // command-line switch.
-FilePath Get7zaPath() {
+base::FilePath Get7zaPath() {
   base::FilePath l7za_path =
       CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           &kSwitch7zaPath[0]);
diff --git a/chrome/installer/test/upgrade_test.cc b/chrome/installer/test/upgrade_test.cc
index 5e1c127..87e9eef 100644
--- a/chrome/installer/test/upgrade_test.cc
+++ b/chrome/installer/test/upgrade_test.cc
@@ -38,7 +38,7 @@ class UpgradeTest : public testing::Test {
   static base::FilePath next_mini_installer_path_;
 };  // class UpgradeTest
 
-FilePath UpgradeTest::next_mini_installer_path_;
+base::FilePath UpgradeTest::next_mini_installer_path_;
 
 TEST_F(UpgradeTest, DoNothing) {
 }
diff --git a/chrome/installer/tools/validate_installation_main.cc b/chrome/installer/tools/validate_installation_main.cc
index bc7f6fa..7cc1161 100644
--- a/chrome/installer/tools/validate_installation_main.cc
+++ b/chrome/installer/tools/validate_installation_main.cc
@@ -87,7 +87,7 @@ ConsoleLogHelper::~ConsoleLogHelper() {
 // Returns the path to the log file to create.  The file should be empty at
 // process exit since we redirect log messages to stderr.
 // static
-FilePath ConsoleLogHelper::GetLogFilePath() {
+base::FilePath ConsoleLogHelper::GetLogFilePath() {
   base::FilePath log_path;
 
   if (PathService::Get(base::DIR_TEMP, &log_path))
diff --git a/chrome/installer/util/delete_reg_value_work_item_unittest.cc b/chrome/installer/util/delete_reg_value_work_item_unittest.cc
index c53421e..29181aa 100644
--- a/chrome/installer/util/delete_reg_value_work_item_unittest.cc
+++ b/chrome/installer/util/delete_reg_value_work_item_unittest.cc
@@ -46,7 +46,7 @@ class DeleteRegValueWorkItemTest : public testing::Test {
 TEST_F(DeleteRegValueWorkItemTest, DeleteExistingValue) {
   RegKey key;
   std::wstring parent_key(kTestRoot);
-  parent_key.push_back(FilePath::kSeparators[0]);
+  parent_key.push_back(base::FilePath::kSeparators[0]);
   parent_key.append(kWriteNew);
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE));
@@ -103,7 +103,7 @@ TEST_F(DeleteRegValueWorkItemTest, DeleteExistingValue) {
 TEST_F(DeleteRegValueWorkItemTest, DeleteNonExistentValue) {
   RegKey key;
   std::wstring parent_key(kTestRoot);
-  parent_key.push_back(FilePath::kSeparators[0]);
+  parent_key.push_back(base::FilePath::kSeparators[0]);
   parent_key.append(kWriteNew);
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE));
diff --git a/chrome/installer/util/set_reg_value_work_item_unittest.cc b/chrome/installer/util/set_reg_value_work_item_unittest.cc
index 0e5763d..4d6bb3d 100644
--- a/chrome/installer/util/set_reg_value_work_item_unittest.cc
+++ b/chrome/installer/util/set_reg_value_work_item_unittest.cc
@@ -50,7 +50,7 @@ TEST_F(SetRegValueWorkItemTest, WriteNewNonOverwrite) {
   RegKey key;
 
   std::wstring parent_key(kTestRoot);
-  parent_key.append(&FilePath::kSeparators[0], 1);
+  parent_key.append(&base::FilePath::kSeparators[0], 1);
   parent_key.append(L"WriteNewNonOverwrite");
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ));
@@ -89,7 +89,7 @@ TEST_F(SetRegValueWorkItemTest, WriteNewOverwrite) {
   RegKey key;
 
   std::wstring parent_key(kTestRoot);
-  parent_key.append(&FilePath::kSeparators[0], 1);
+  parent_key.append(&base::FilePath::kSeparators[0], 1);
   parent_key.append(L"WriteNewOverwrite");
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ));
@@ -129,7 +129,7 @@ TEST_F(SetRegValueWorkItemTest, WriteExistingNonOverwrite) {
   RegKey key;
 
   std::wstring parent_key(kTestRoot);
-  parent_key.append(&FilePath::kSeparators[0], 1);
+  parent_key.append(&base::FilePath::kSeparators[0], 1);
   parent_key.append(L"WriteExistingNonOverwrite");
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(),
@@ -179,7 +179,7 @@ TEST_F(SetRegValueWorkItemTest, WriteExistingOverwrite) {
   RegKey key;
 
   std::wstring parent_key(kTestRoot);
-  parent_key.append(&FilePath::kSeparators[0], 1);
+  parent_key.append(&base::FilePath::kSeparators[0], 1);
   parent_key.append(L"WriteExistingOverwrite");
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(),
@@ -250,7 +250,7 @@ TEST_F(SetRegValueWorkItemTest, WriteNonExistingKey) {
   RegKey key;
 
   std::wstring parent_key(kTestRoot);
-  parent_key.append(&FilePath::kSeparators[0], 1);
+  parent_key.append(&base::FilePath::kSeparators[0], 1);
   parent_key.append(L"WriteNonExistingKey");
 
   std::wstring name(L"name");