Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

chrome/browser/extensions/api/sync_file_system/sync_file_system_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_API_H_
 
 #include <map>
 
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h"
 #include "chrome/browser/sync_file_system/sync_file_status.h"
 #include "chrome/browser/sync_file_system/sync_status_code.h"
 #include "chrome/common/extensions/api/sync_file_system.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/common/quota/quota_types.h"
 
-namespace fileapi {
+namespace storage {
 class FileSystemContext;
 }
 
 namespace extensions {
 
 class SyncFileSystemDeleteFileSystemFunction
     : public ChromeAsyncExtensionFunction {
  public:
   // TODO(kinuko,calvinlo): Uncomment this or delete this class when
   // we decide if we want to revive this function.
@@ skipping 31 matching lines @@
                              SYNCFILESYSTEM_GETFILESYNCSTATUSES)
   SyncFileSystemGetFileStatusesFunction();
 
  protected:
   virtual ~SyncFileSystemGetFileStatusesFunction();
   virtual bool RunAsync() OVERRIDE;
 
  private:
   typedef std::pair<sync_file_system::SyncStatusCode,
                     sync_file_system::SyncFileStatus> FileStatusPair;
-  typedef std::map<fileapi::FileSystemURL, FileStatusPair,
-                   fileapi::FileSystemURL::Comparator> URLToStatusMap;
+  typedef std::map<storage::FileSystemURL,
+                   FileStatusPair,
+                   storage::FileSystemURL::Comparator> URLToStatusMap;
 
-  void DidGetFileStatus(
-      const fileapi::FileSystemURL& file_system_url,
-      sync_file_system::SyncStatusCode sync_status_code,
-      sync_file_system::SyncFileStatus sync_file_statuses);
+  void DidGetFileStatus(const storage::FileSystemURL& file_system_url,
+                        sync_file_system::SyncStatusCode sync_status_code,
+                        sync_file_system::SyncFileStatus sync_file_statuses);
 
   unsigned int num_expected_results_;
   unsigned int num_results_received_;
   URLToStatusMap file_sync_statuses_;
 };
 
 class SyncFileSystemGetUsageAndQuotaFunction
     : public ChromeAsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("syncFileSystem.getUsageAndQuota",
                              SYNCFILESYSTEM_GETUSAGEANDQUOTA)
 
  protected:
   virtual ~SyncFileSystemGetUsageAndQuotaFunction() {}
   virtual bool RunAsync() OVERRIDE;
 
  private:
-  void DidGetUsageAndQuota(quota::QuotaStatusCode status,
+  void DidGetUsageAndQuota(storage::QuotaStatusCode status,
                            int64 usage,
                            int64 quota);
 };
 
 class SyncFileSystemRequestFileSystemFunction
     : public ChromeAsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("syncFileSystem.requestFileSystem",
                              SYNCFILESYSTEM_REQUESTFILESYSTEM)
 
  protected:
   virtual ~SyncFileSystemRequestFileSystemFunction() {}
   virtual bool RunAsync() OVERRIDE;
 
  private:
   typedef SyncFileSystemRequestFileSystemFunction self;
 
   // Returns the file system context for this extension.
-  fileapi::FileSystemContext* GetFileSystemContext();
+  storage::FileSystemContext* GetFileSystemContext();
 
   void DidOpenFileSystem(const GURL& root_url,
                          const std::string& file_system_name,
                          base::File::Error error);
 };
 
 class SyncFileSystemSetConflictResolutionPolicyFunction
     : public ChromeSyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("syncFileSystem.setConflictResolutionPolicy",
@@ skipping 22 matching lines @@
                              SYNCFILESYSTEM_GETSERVICESTATUS)
 
  protected:
   virtual ~SyncFileSystemGetServiceStatusFunction() {}
   virtual bool RunSync() OVERRIDE;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_API_H_