Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/media_galleries/fileapi/itunes_data_provider.cc

 // Copyright 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/itunes_data_provider.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/format_macros.h"
 #include "base/i18n/i18n_constants.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/media_galleries/fileapi/file_path_watcher_util.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
 #include "chrome/common/media_galleries/itunes_library.h"
 #include "third_party/icu/source/common/unicode/locid.h"
-#include "webkit/browser/fileapi/native_file_util.h"
+#include "storage/browser/fileapi/native_file_util.h"
 
 namespace itunes {
 
 namespace {
 
 // Colon and slash are not allowed in filenames, replace them with underscore.
 std::string SanitizeName(const std::string& input) {
   std::string result;
   base::ConvertToUtf8AndNormalize(input, base::kCodepageUTF8, &result);
   base::ReplaceChars(result, ":/", "_", &result);
@@ skipping 53 matching lines @@
   DCHECK(!locale_string.empty());
   DCHECK(result_path);
 
   std::map<std::string, std::string>::const_iterator it =
       localized_dir_names.find(locale_string);
   if (it == localized_dir_names.end())
     return false;
 
   base::FilePath localized_auto_add_path =
       media_path.Append(base::FilePath::FromUTF8Unsafe(it->second));
-  if (!fileapi::NativeFileUtil::DirectoryExists(localized_auto_add_path))
+  if (!storage::NativeFileUtil::DirectoryExists(localized_auto_add_path))
     return false;
 
   *result_path = localized_auto_add_path;
   return true;
 }
 
 // This method is complex because Apple localizes the directory name in versions
 // of iTunes before 10.6.
 base::FilePath GetAutoAddPath(const base::FilePath& library_path) {
   const char kiTunesMediaDir[] = "iTunes Media";
   base::FilePath media_path =
       library_path.DirName().AppendASCII(kiTunesMediaDir);
 
   // Test 'universal' path first.
   base::FilePath universal_auto_add_path =
       media_path.AppendASCII("Automatically Add to iTunes.localized");
-  if (fileapi::NativeFileUtil::DirectoryExists(universal_auto_add_path))
+  if (storage::NativeFileUtil::DirectoryExists(universal_auto_add_path))
     return universal_auto_add_path;
 
   // Test user locale. Localized directory names encoded in UTF-8.
   std::map<std::string, std::string> localized_dir_names;
   localized_dir_names["nl"] = "Voeg automatisch toe aan iTunes";
   localized_dir_names["en"] = "Automatically Add to iTunes";
   localized_dir_names["fr"] = "Ajouter automatiquement \xC3\xA0 iTunes";
   localized_dir_names["de"] = "Automatisch zu iTunes hinzuf\xC3\xBCgen";
   localized_dir_names["it"] = "Aggiungi automaticamente a iTunes";
   localized_dir_names["ja"] = "iTunes \xE3\x81\xAB\xE8\x87\xAA\xE5\x8B\x95\xE7"
@@ skipping 166 matching lines @@
         std::string album_name = SanitizeName(album_it->first);
         library_[artist_name][album_name] =
             MakeUniqueTrackNames(album_it->second);
       }
     }
   }
   ready_callback.Run(valid());
 }
 
 }  // namespace itunes