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

chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.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/sync_file_system/drive_backend_v1/drive_metadata_store.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.h"
 #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h"
 #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h"
 #include "chrome/browser/sync_file_system/logger.h"
 #include "chrome/browser/sync_file_system/sync_file_system.pb.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 #include "url/gurl.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/common/fileapi/file_system_util.h"
 
-using fileapi::FileSystemURL;
+using storage::FileSystemURL;
 
 namespace sync_file_system {
 
 typedef DriveMetadataStore::MetadataMap MetadataMap;
 typedef DriveMetadataStore::OriginByResourceId OriginByResourceId;
 typedef DriveMetadataStore::PathToMetadata PathToMetadata;
 typedef DriveMetadataStore::ResourceIdByOrigin ResourceIdByOrigin;
 
 const base::FilePath::CharType DriveMetadataStore::kDatabaseName[] =
     FILE_PATH_LITERAL("DriveMetadata");
@@ skipping 627 matching lines @@
 
 void DriveMetadataStore::UpdateDBStatusAndInvokeCallback(
     const SyncStatusCallback& callback,
     const leveldb::Status& leveldb_status) {
   SyncStatusCode status = LevelDBStatusToSyncStatusCode(leveldb_status);
   UpdateDBStatus(status);
   callback.Run(status);
 }
 
 SyncStatusCode DriveMetadataStore::GetConflictURLs(
-    fileapi::FileSystemURLSet* urls) const {
+    storage::FileSystemURLSet* urls) const {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(SYNC_STATUS_OK, db_status_);
 
   urls->clear();
   for (MetadataMap::const_iterator origin_itr = metadata_map_.begin();
        origin_itr != metadata_map_.end();
        ++origin_itr) {
     for (PathToMetadata::const_iterator itr = origin_itr->second.begin();
          itr != origin_itr->second.end();
          ++itr) {
@@ skipping 99 matching lines @@
     details->SetString("dirty", metadata.to_be_fetched() ? "true" : "false");
 
     file->Set("details", details);
     files->Append(file);
   }
 
   return files.Pass();
 }
 
 }  // namespace sync_file_system