Revert 67385 - On windows filepaths need \\?\ prefix to allow extended file p...

webkit/fileapi/file_system_path_manager.cc

 // Copyright (c) 2010 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 "webkit/fileapi/file_system_path_manager.h"
 
 #include "base/file_util.h"
 #include "base/rand_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 106 matching lines @@
       DispatchCallbackOnCallerThread(FilePath());
       return;
     }
 
     // Creates the root directory.
     root = base_path.Append(CreateUniqueDirectoryName(origin_url));
     if (!file_util::CreateDirectory(root)) {
       DispatchCallbackOnCallerThread(FilePath());
       return;
     }
-
     DispatchCallbackOnCallerThread(root);
   }
 
   bool ReadOriginDirectory(const FilePath& base_path,
                            const GURL& origin_url,
                            FilePath* unique) {
     file_util::FileEnumerator file_enum(
         base_path, false /* recursive */,
         file_util::FileEnumerator::DIRECTORIES,
         FilePath::StringType(kFileSystemUniqueNamePrefix) +
@@ skipping 26 matching lines @@
     callback_->Run(!root_path.empty(), root_path, name_);
     callback_.reset();
   }
 
   scoped_refptr<base::MessageLoopProxy> file_message_loop_;
   scoped_refptr<base::MessageLoopProxy> origin_message_loop_proxy_;
   std::string name_;
   scoped_ptr<FileSystemPathManager::GetRootPathCallback> callback_;
 };
 
-FilePath FileSystemPathManager::GetFileSystemCommonRootDirectory(
-    const FilePath& root_path) {
-#if defined(OS_WIN)
-  // To specify an extended-length path, "\\?\" prefix is used. Else path names
-  // are limited to 260 characters.
-  FilePath::StringType extended_length_str(L"\\\\?\\");
-  extended_length_str.append(root_path.value());
-  return FilePath(extended_length_str).Append(kFileSystemDirectory);
-#endif
-  return root_path.Append(kFileSystemDirectory);
-}
-
 FileSystemPathManager::FileSystemPathManager(
     scoped_refptr<base::MessageLoopProxy> file_message_loop,
     const FilePath& profile_path,
     bool is_incognito,
     bool allow_file_access_from_files)
     : file_message_loop_(file_message_loop),
-      base_path_(GetFileSystemCommonRootDirectory(profile_path)),
+      base_path_(profile_path.Append(kFileSystemDirectory)),
       is_incognito_(is_incognito),
       allow_file_access_from_files_(allow_file_access_from_files) {
 }
 
 FileSystemPathManager::~FileSystemPathManager() {}
 
 void FileSystemPathManager::GetFileSystemRootPath(
     const GURL& origin_url, fileapi::FileSystemType type,
     bool create, GetRootPathCallback* callback_ptr) {
   scoped_ptr<GetRootPathCallback> callback(callback_ptr);
@@ skipping 18 matching lines @@
   std::string storage_identifier = GetStorageIdentifierFromURL(origin_url);
 
   std::string type_string;
   if (type == fileapi::kFileSystemTypeTemporary)
     type_string = kTemporaryName;
   else if (type == fileapi::kFileSystemTypePersistent)
     type_string = kPersistentName;
   DCHECK(!type_string.empty());
 
   FilePath origin_base_path = base_path_.AppendASCII(storage_identifier)
-      .AppendASCII(type_string);
-
+                                        .AppendASCII(type_string);
   std::string name = storage_identifier + ":" + type_string;
 
   scoped_refptr<GetFileSystemRootPathTask> task(
       new GetFileSystemRootPathTask(file_message_loop_,
                                     name, callback.release()));
   task->Start(origin_url, origin_base_path, create);
 }
 
 bool FileSystemPathManager::CrackFileSystemPath(
     const FilePath& path, GURL* origin_url, FileSystemType* type,
@@ skipping 103 matching lines @@
       WebKit::WebSecurityOrigin::createFromString(UTF8ToUTF16(url.spec()));
   return web_security_origin.databaseIdentifier().utf8();
 }
 
 }  // namespace fileapi
 
 COMPILE_ASSERT(int(WebFileSystem::TypeTemporary) == \
                int(fileapi::kFileSystemTypeTemporary), mismatching_enums);
 COMPILE_ASSERT(int(WebFileSystem::TypePersistent) == \
                int(fileapi::kFileSystemTypePersistent), mismatching_enums);