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

chrome/browser/sync_file_system/sync_file_system_service.cc

 // Copyright (c) 2012 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/sync_file_system_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/sync_file_system/sync_status_code.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "url/gurl.h"
-#include "webkit/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_context.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
-using fileapi::FileSystemURL;
-using fileapi::FileSystemURLSet;
+using storage::FileSystemURL;
+using storage::FileSystemURLSet;
 
 namespace sync_file_system {
 
 namespace {
 
 const char kLocalSyncName[] = "Local sync";
 const char kRemoteSyncName[] = "Remote sync";
 const char kRemoteSyncNameV2[] = "Remote sync (v2)";
 
 SyncServiceState RemoteStateToSyncServiceState(
@@ skipping 215 matching lines @@
 
   profile_ = NULL;
 }
 
 SyncFileSystemService::~SyncFileSystemService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!profile_);
 }
 
 void SyncFileSystemService::InitializeForApp(
-    fileapi::FileSystemContext* file_system_context,
+    storage::FileSystemContext* file_system_context,
     const GURL& app_origin,
     const SyncStatusCallback& callback) {
   DCHECK(local_service_);
   DCHECK(remote_service_);
   DCHECK(app_origin == app_origin.GetOrigin());
 
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "Initializing for App: %s", app_origin.spec().c_str());
 
   local_service_->MaybeInitializeFileSystemContext(
       app_origin, file_system_context,
       base::Bind(&SyncFileSystemService::DidInitializeFileSystem,
                  AsWeakPtr(), app_origin, callback));
 }
 
 void SyncFileSystemService::GetExtensionStatusMap(
     const ExtensionStatusMapCallback& callback) {
   remote_service_->GetOriginStatusMap(
       base::Bind(&SyncFileSystemService::DidGetExtensionStatusMap,
                  AsWeakPtr(), callback));
 }
 
 void SyncFileSystemService::DumpFiles(const GURL& origin,
                                       const DumpFilesCallback& callback) {
   DCHECK(!origin.is_empty());
 
   content::StoragePartition* storage_partition =
       content::BrowserContext::GetStoragePartitionForSite(profile_, origin);
-  fileapi::FileSystemContext* file_system_context =
+  storage::FileSystemContext* file_system_context =
       storage_partition->GetFileSystemContext();
   local_service_->MaybeInitializeFileSystemContext(
       origin, file_system_context,
       base::Bind(&SyncFileSystemService::DidInitializeFileSystemForDump,
                  AsWeakPtr(), origin, callback));
 }
 
 void SyncFileSystemService::DumpDatabase(const DumpFilesCallback& callback) {
   remote_service_->DumpDatabase(
       base::Bind(&SyncFileSystemService::DidDumpDatabase,
@@ skipping 443 matching lines @@
     v2_remote_service_->AddServiceObserver(v2_remote_syncer.get());
     v2_remote_service_->AddFileStatusObserver(this);
     v2_remote_service_->SetRemoteChangeProcessor(local_service_.get());
     v2_remote_service_->SetSyncEnabled(sync_enabled_);
     remote_sync_runners_.push_back(v2_remote_syncer.release());
   }
   return v2_remote_service_.get();
 }
 
 }  // namespace sync_file_system