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

win8/metro_driver/file_picker_ash.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "stdafx.h"
 #include "win8/metro_driver/file_picker_ash.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 159 matching lines @@
         hr = ComposeMultiFileResult(files.Get(), &result);
 
       if (SUCCEEDED(hr)) {
         success_ = true;
         // The code below has been copied from the
         // SelectFileDialogImpl::RunOpenMultiFileDialog function in
         // select_file_dialog_win.cc.
         // 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;
         }
         if (files.empty()) {
           success_ = false;
         } else if (files.size() == 1) {
           // When there is one file, it contains the path and filename.
           filenames_ = files;
         } 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));
           }
         }
       }
     } else {
       LOG(ERROR) << "NULL StorageFileVectorCollection";
     }
   } else {
     LOG(ERROR) << "Unexpected async status " << status;
@@ skipping 43 matching lines @@
       // Metro wants suffixes only, not patterns.
       mswrw::HString extension;
       std::vector<string16> extensions;
       for (size_t i = 0; i < extensions_win32_style.size(); ++i) {
         if (extensions_win32_style[i] == L"*.*") {
           // The wildcard filter is "*" for Metro. The string "*.*" produces
           // an "invalid parameter" error.
           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;
           }
           hr = extension.Set(ext.c_str());
         }
         if (SUCCEEDED(hr))
           hr = filter->Append(extension.Get());
         if (FAILED(hr))
           return hr;
@@ skipping 51 matching lines @@
   if (FAILED(hr))
     return hr;
 
   // Make sure we return an error on an empty collection.
   if (num_files == 0) {
     DLOG(ERROR) << "Empty collection on input.";
     return E_UNEXPECTED;
   }
 
   // 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) {
     mswr::ComPtr<winstorage::IStorageFile> file;
     hr = files->GetAt(i, file.GetAddressOf());
     if (FAILED(hr))
       return hr;
 
     mswr::ComPtr<winstorage::IStorageItem> storage_item;
     hr = file.As(&storage_item);
     if (FAILED(hr))
       return hr;
 
     mswrw::HString file_path_str;
     hr = storage_item->get_Path(file_path_str.GetAddressOf());
     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();
 
       // Append the path, including the terminating zero.
       // We do this only for the first file.
       result->append(base_path.value().c_str(), base_path.value().size() + 1);
     }
     DCHECK(!result->empty());
     DCHECK(!base_path.empty());
     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);
   }
 
   DCHECK(!result->empty());
 
   return S_OK;
 }
 
 SaveFilePickerSession::SaveFilePickerSession(
     ChromeAppViewAsh* app_view,
@@ skipping 50 matching lines @@
 
       // There can be a single extension, or a list of semicolon-separated ones.
       std::vector<string16> extensions_win32_style;
       size_t extension_count = Tokenize(walk, L";", &extensions_win32_style);
       DCHECK_EQ(extension_count, extensions_win32_style.size());
 
       // Metro wants suffixes only, not patterns.  Also, metro does not support
       // 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;
         extensions.push_back(ext);
       }
 
       if (!extensions.empty()) {
         // Convert to a Metro collection class.
         mswr::ComPtr<StringVectorItf> list;
         hr = mswr::MakeAndInitialize<StringVectorImpl>(
@@ skipping 90 matching lines @@
     } else {
       LOG(ERROR) << "NULL IStorageItem";
     }
   } else {
     LOG(ERROR) << "Unexpected async status " << status;
   }
   app_view_->OnSaveFileCompleted(this, success_);
   return S_OK;
 }