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

chrome/browser/sync_file_system/remote_file_sync_service.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_SYNC_FILE_SYSTEM_REMOTE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_FILE_SYNC_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 10 matching lines @@
 class GURL;
 
 namespace base {
 class ListValue;
 }
 
 namespace content {
 class BrowserContext;
 }
 
-namespace webkit_blob {
+namespace storage {
 class ScopedFile;
 }
 
 namespace sync_file_system {
 
 class FileStatusObserver;
 class LocalChangeProcessor;
 class RemoteChangeProcessor;
 class TaskLogger;
 
@@ skipping 73 matching lines @@
 
   // For GetOriginStatusMap.
   typedef std::map<GURL, std::string> OriginStatusMap;
   typedef base::Callback<void(scoped_ptr<OriginStatusMap> status_map)>
       StatusMapCallback;
 
   // For GetRemoteVersions.
   typedef base::Callback<void(SyncStatusCode status,
                               const std::vector<Version>& versions)>
       RemoteVersionsCallback;
-  typedef base::Callback<void(SyncStatusCode status,
-                              webkit_blob::ScopedFile downloaded)>
+  typedef base::Callback<
+      void(SyncStatusCode status, storage::ScopedFile downloaded)>
       DownloadVersionCallback;
 
   // For DumpFile.
   typedef base::Callback<void(scoped_ptr<base::ListValue> list)> ListCallback;
 
   // Creates an initialized RemoteFileSyncService for backend |version|
   // for |context|.
   static scoped_ptr<RemoteFileSyncService> CreateForBrowserContext(
       content::BrowserContext* context,
       TaskLogger* task_logger);
@@ skipping 76 matching lines @@
 
   virtual void PromoteDemotedChanges(const base::Closure& callback) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RemoteFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_FILE_SYNC_SERVICE_H_