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

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

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

6 files changed, 20 insertions, 20 deletions

diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc
index 71bd8fc..4979f4c 100644
--- a/win8/metro_driver/file_picker.cc
+++ b/win8/metro_driver/file_picker.cc
@@ -319,7 +319,7 @@ HRESULT OpenFilePickerSession::StartFilePicker() {
           hr = extension.Set(L"*");
         } else {
           // Metro wants suffixes only, not patterns.
-          string16 ext = FilePath(extensions_win32_style[i]).Extension();
+          string16 ext = base::FilePath(extensions_win32_style[i]).Extension();
           if ((ext.size() < 2) ||
               (ext.find_first_of(L"*?") != string16::npos)) {
             continue;
@@ -391,7 +391,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult(
   }
 
   // This stores the base path that should be the parent of all the files.
-  FilePath base_path;
+  base::FilePath base_path;
 
   // Iterate through the collection and append the file paths to the result.
   for (unsigned int i = 0; i < num_files; ++i) {
@@ -410,7 +410,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult(
     if (FAILED(hr))
       return hr;
 
-    FilePath file_path(MakeStdWString(file_path_str.Get()));
+    base::FilePath file_path(MakeStdWString(file_path_str.Get()));
     if (base_path.empty()) {
       DCHECK(result->empty());
       base_path = file_path.DirName();
@@ -424,7 +424,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult(
     DCHECK(base_path == file_path.DirName());
 
     // Append the base name, including the terminating zero.
-    FilePath base_name = file_path.BaseName();
+    base::FilePath base_name = file_path.BaseName();
     result->append(base_name.value().c_str(), base_name.value().size() + 1);
   }
 
@@ -484,7 +484,7 @@ HRESULT SaveFilePickerSession::StartFilePicker() {
       // the all files ("*") pattern in the save picker.
       std::vector<string16> extensions;
       for (size_t i = 0; i < extensions_win32_style.size(); ++i) {
-        string16 ext = FilePath(extensions_win32_style[i]).Extension();
+        string16 ext = base::FilePath(extensions_win32_style[i]).Extension();
         if ((ext.size() < 2) ||
             (ext.find_first_of(L"*?") != string16::npos))
           continue;
diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc
index 4b73b90..816defa 100644
--- a/win8/metro_driver/file_picker_ash.cc
+++ b/win8/metro_driver/file_picker_ash.cc
@@ -177,10 +177,10 @@ HRESULT OpenFilePickerSession::MultiPickerDone(MultiFileAsyncOp* async,
         // TODO(ananta)
         // Consolidate this into a common place.
         const wchar_t* selection = result.c_str();
-        std::vector<FilePath> files;
+        std::vector<base::FilePath> files;
 
         while (*selection) {  // Empty string indicates end of list.
-          files.push_back(FilePath(selection));
+          files.push_back(base::FilePath(selection));
           // Skip over filename and null-terminator.
           selection += files.back().value().length() + 1;
         }
@@ -192,8 +192,8 @@ HRESULT OpenFilePickerSession::MultiPickerDone(MultiFileAsyncOp* async,
         } else if (files.size() > 1) {
           // Otherwise, the first string is the path, and the remainder are
           // filenames.
-          std::vector<FilePath>::iterator path = files.begin();
-          for (std::vector<FilePath>::iterator file = path + 1;
+          std::vector<base::FilePath>::iterator path = files.begin();
+          for (std::vector<base::FilePath>::iterator file = path + 1;
                file != files.end(); ++file) {
             filenames_.push_back(path->Append(*file));
           }
@@ -257,7 +257,7 @@ HRESULT OpenFilePickerSession::StartFilePicker() {
           hr = extension.Set(L"*");
         } else {
           // Metro wants suffixes only, not patterns.
-          string16 ext = FilePath(extensions_win32_style[i]).Extension();
+          string16 ext = base::FilePath(extensions_win32_style[i]).Extension();
           if ((ext.size() < 2) ||
               (ext.find_first_of(L"*?") != string16::npos)) {
             continue;
@@ -329,7 +329,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult(
   }
 
   // This stores the base path that should be the parent of all the files.
-  FilePath base_path;
+  base::FilePath base_path;
 
   // Iterate through the collection and append the file paths to the result.
   for (unsigned int i = 0; i < num_files; ++i) {
@@ -348,7 +348,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult(
     if (FAILED(hr))
       return hr;
 
-    FilePath file_path(MakeStdWString(file_path_str.Get()));
+    base::FilePath file_path(MakeStdWString(file_path_str.Get()));
     if (base_path.empty()) {
       DCHECK(result->empty());
       base_path = file_path.DirName();
@@ -362,7 +362,7 @@ HRESULT OpenFilePickerSession::ComposeMultiFileResult(
     DCHECK(base_path == file_path.DirName());
 
     // Append the base name, including the terminating zero.
-    FilePath base_name = file_path.BaseName();
+    base::FilePath base_name = file_path.BaseName();
     result->append(base_name.value().c_str(), base_name.value().size() + 1);
   }
 
@@ -433,7 +433,7 @@ HRESULT SaveFilePickerSession::StartFilePicker() {
       // the all files ("*") pattern in the save picker.
       std::vector<string16> extensions;
       for (size_t i = 0; i < extensions_win32_style.size(); ++i) {
-        string16 ext = FilePath(extensions_win32_style[i]).Extension();
+        string16 ext = base::FilePath(extensions_win32_style[i]).Extension();
         if ((ext.size() < 2) ||
             (ext.find_first_of(L"*?") != string16::npos))
           continue;
diff --git a/win8/metro_driver/secondary_tile.cc b/win8/metro_driver/secondary_tile.cc
index d58a081..dd99a8a 100644
--- a/win8/metro_driver/secondary_tile.cc
+++ b/win8/metro_driver/secondary_tile.cc
@@ -123,7 +123,7 @@ void DeleteTileFromStartScreen(const string16& tile_id,
 void CreateTileOnStartScreen(const string16& tile_id,
                              const string16& title_str,
                              const string16& url_str,
-                             const FilePath& logo_path,
+                             const base::FilePath& logo_path,
                              const MetroPinUmaResultCallback& callback) {
   VLOG(1) << __FUNCTION__;
 
@@ -215,7 +215,7 @@ void MetroUnPinFromStartScreen(const string16& tile_id,
 void MetroPinToStartScreen(const string16& tile_id,
                            const string16& title,
                            const string16& url,
-                           const FilePath& logo_path,
+                           const base::FilePath& logo_path,
                            const MetroPinUmaResultCallback& callback) {
   globals.appview_msg_loop->PostTask(
     FROM_HERE, base::Bind(&CreateTileOnStartScreen,
diff --git a/win8/metro_driver/secondary_tile.h b/win8/metro_driver/secondary_tile.h
index 457a23ed..ed3f58f 100644
--- a/win8/metro_driver/secondary_tile.h
+++ b/win8/metro_driver/secondary_tile.h
@@ -21,7 +21,7 @@ void MetroPinToStartScreen(
     const string16& tile_id,
     const string16& title,
     const string16& url,
-    const FilePath& logo_path,
+    const base::FilePath& logo_path,
     const base::win::MetroPinUmaResultCallback& callback);
 
 #endif  // CHROME_BROWSER_UI_METRO_DRIVER_SECONDARY_TILE_H_
diff --git a/win8/metro_driver/toast_notification_handler.cc b/win8/metro_driver/toast_notification_handler.cc
index 5545cd2..525331e 100644
--- a/win8/metro_driver/toast_notification_handler.cc
+++ b/win8/metro_driver/toast_notification_handler.cc
@@ -196,7 +196,7 @@ void ToastNotificationHandler::DisplayNotification(
       toast_xml.Get(), &notification_);
   CheckHR(hr);
 
-  FilePath chrome_path;
+  base::FilePath chrome_path;
   if (!PathService::Get(base::FILE_EXE, &chrome_path)) {
     NOTREACHED() << "Failed to get chrome exe path";
     return;
diff --git a/win8/metro_driver/winrt_utils.cc b/win8/metro_driver/winrt_utils.cc
index 04b97d0..8df33f0 100644
--- a/win8/metro_driver/winrt_utils.cc
+++ b/win8/metro_driver/winrt_utils.cc
@@ -180,7 +180,7 @@ HRESULT CompareProperties(winfoundtn::IPropertyValue* lhs,
   return hr;
 }
 
-bool GetArgumentsFromShortcut(const FilePath& shortcut,
+bool GetArgumentsFromShortcut(const base::FilePath& shortcut,
                               string16* arguments) {
   HRESULT result;
   base::win::ScopedComPtr<IShellLink> i_shell_link;
@@ -216,7 +216,7 @@ string16 ReadArgumentsFromPinnedTaskbarShortcut() {
 
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL,
                                 SHGFP_TYPE_CURRENT, path_buffer))) {
-    FilePath shortcut(path_buffer);
+    base::FilePath shortcut(path_buffer);
     shortcut = shortcut.Append(
         L"Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar");