Fix name conflict with FileSystemType from winnt.h

chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.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 "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 17 matching lines @@
 #include "webkit/fileapi/isolated_file_util.h"
 #include "webkit/fileapi/local_file_stream_writer.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/native_file_util.h"
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
 #include "chrome/browser/media_galleries/fileapi/device_media_async_file_util.h"
 #endif
 
 using fileapi::FileSystemContext;
-using fileapi::FileSystemType;
 using fileapi::FileSystemURL;
+// 'using fileapi::FileSystemType' doesn't work because it conflicts with
+// winnt.h's FileSystemType enum value in global scope.
 
 namespace chrome {
 
 const char MediaFileSystemMountPointProvider::kMediaPathFilterKey[] =
     "MediaPathFilterKey";
 const char MediaFileSystemMountPointProvider::kMTPDeviceDelegateURLKey[] =
     "MTPDeviceDelegateKey";
 
 MediaFileSystemMountPointProvider::MediaFileSystemMountPointProvider(
     const base::FilePath& profile_path)
     : profile_path_(profile_path),
       media_path_filter_(new MediaPathFilter()),
       native_media_file_util_(
           new fileapi::AsyncFileUtilAdapter(new NativeMediaFileUtil())),
       itunes_file_util_(new fileapi::AsyncFileUtilAdapter(
           new itunes::ItunesFileUtil())) {
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   // TODO(kmadhusu): Initialize |device_media_file_util_| in
   // initialization list.
   device_media_async_file_util_.reset(
       DeviceMediaAsyncFileUtil::Create(profile_path_));
 #endif
 }
 
 MediaFileSystemMountPointProvider::~MediaFileSystemMountPointProvider() {
 }
 
 bool MediaFileSystemMountPointProvider::CanHandleType(
-    FileSystemType type) const {
+    fileapi::FileSystemType type) const {
   switch (type) {
     case fileapi::kFileSystemTypeNativeMedia:
     case fileapi::kFileSystemTypeDeviceMedia:
     case fileapi::kFileSystemTypeItunes:
       return true;
     default:
       return false;
   }
 }
 
 void MediaFileSystemMountPointProvider::ValidateFileSystemRoot(
     const GURL& origin_url,
-    FileSystemType type,
+    fileapi::FileSystemType type,
     bool create,
     const ValidateFileSystemCallback& callback) {
   // We never allow opening a new isolated FileSystem via usual OpenFileSystem.
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(callback, base::PLATFORM_FILE_ERROR_SECURITY));
 }
 
 base::FilePath
 MediaFileSystemMountPointProvider::GetFileSystemRootPathOnFileThread(
     const FileSystemURL& url,
     bool create) {
   // This is not supposed to be used.
   NOTREACHED();
   return base::FilePath();
 }
 
 fileapi::FileSystemFileUtil* MediaFileSystemMountPointProvider::GetFileUtil(
-    FileSystemType type) {
+    fileapi::FileSystemType type) {
   switch (type) {
     case fileapi::kFileSystemTypeNativeMedia:
       return native_media_file_util_->sync_file_util();
     default:
       NOTREACHED();
   }
   return NULL;
 }
 
 fileapi::AsyncFileUtil* MediaFileSystemMountPointProvider::GetAsyncFileUtil(
-    FileSystemType type) {
+    fileapi::FileSystemType type) {
   switch (type) {
     case fileapi::kFileSystemTypeNativeMedia:
       return native_media_file_util_.get();
     case fileapi::kFileSystemTypeDeviceMedia:
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
       return device_media_async_file_util_.get();
 #endif
     case fileapi::kFileSystemTypeItunes:
       return itunes_file_util_.get();
     default:
       NOTREACHED();
   }
   return NULL;
 }
 
 fileapi::CopyOrMoveFileValidatorFactory*
 MediaFileSystemMountPointProvider::GetCopyOrMoveFileValidatorFactory(
-    FileSystemType type, base::PlatformFileError* error_code) {
+    fileapi::FileSystemType type, base::PlatformFileError* error_code) {
   DCHECK(error_code);
   *error_code = base::PLATFORM_FILE_OK;
   switch (type) {
     case fileapi::kFileSystemTypeNativeMedia:
     case fileapi::kFileSystemTypeDeviceMedia:
       if (!media_copy_or_move_file_validator_factory_) {
         *error_code = base::PLATFORM_FILE_ERROR_SECURITY;
         return NULL;
       }
       return media_copy_or_move_file_validator_factory_.get();
     default:
       NOTREACHED();
   }
   return NULL;
 }
 
 void
 MediaFileSystemMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
-    FileSystemType type,
+    fileapi::FileSystemType type,
     scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) {
   switch (type) {
     case fileapi::kFileSystemTypeNativeMedia:
     case fileapi::kFileSystemTypeDeviceMedia:
       if (!media_copy_or_move_file_validator_factory_)
         media_copy_or_move_file_validator_factory_.reset(factory.release());
       break;
     default:
       NOTREACHED();
   }
@@ skipping 51 matching lines @@
 }
 
 fileapi::FileSystemQuotaUtil*
 MediaFileSystemMountPointProvider::GetQuotaUtil() {
   // No quota support.
   return NULL;
 }
 
 void MediaFileSystemMountPointProvider::DeleteFileSystem(
     const GURL& origin_url,
-    FileSystemType type,
+    fileapi::FileSystemType type,
     FileSystemContext* context,
     const DeleteFileSystemCallback& callback) {
   NOTREACHED();
   callback.Run(base::PLATFORM_FILE_ERROR_INVALID_OPERATION);
 }
 
 }  // namespace chrome