CacheStorage: Merge CacheStorage::CacheStorageError and CacheStorageCache::ErrorType

content/browser/cache_storage/cache_storage_dispatcher_host.h

 // Copyright 2015 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 CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_
 
 #include <list>
 
 #include "content/browser/cache_storage/cache_storage.h"
@@ skipping 67 matching lines @@
                     int request_id,
                     int cache_id,
                     const std::vector<CacheStorageBatchOperation>& operations);
   void OnCacheClosed(int cache_id);
   void OnBlobDataHandled(const std::string& uuid);
 
   // CacheStorageManager callbacks
   void OnCacheStorageHasCallback(int thread_id,
                                  int request_id,
                                  bool has_cache,
-                                 CacheStorage::CacheStorageError error);
+                                 CacheStorageError error);
   void OnCacheStorageOpenCallback(int thread_id,
                                   int request_id,
                                   const scoped_refptr<CacheStorageCache>& cache,
-                                  CacheStorage::CacheStorageError error);
+                                  CacheStorageError error);
   void OnCacheStorageDeleteCallback(int thread_id,
                                     int request_id,
                                     bool deleted,
-                                    CacheStorage::CacheStorageError error);
+                                    CacheStorageError error);
   void OnCacheStorageKeysCallback(int thread_id,
                                   int request_id,
                                   const std::vector<std::string>& strings,
-                                  CacheStorage::CacheStorageError error);
+                                  CacheStorageError error);
   void OnCacheStorageMatchCallback(
       int thread_id,
       int request_id,
-      CacheStorageCache::ErrorType error,
+      CacheStorageError error,
       scoped_ptr<ServiceWorkerResponse> response,
       scoped_ptr<storage::BlobDataHandle> blob_data_handle);
 
   // Cache callbacks.
   void OnCacheMatchCallback(
       int thread_id,
       int request_id,
       const scoped_refptr<CacheStorageCache>& cache,
-      CacheStorageCache::ErrorType error,
+      CacheStorageError error,
       scoped_ptr<ServiceWorkerResponse> response,
       scoped_ptr<storage::BlobDataHandle> blob_data_handle);
   void OnCacheMatchAll(int thread_id,
                        int request_id,
                        int cache_id,
                        const ServiceWorkerFetchRequest& request,
                        const CacheStorageCacheQueryParams& match_params);
   void OnCacheKeysCallback(int thread_id,
                            int request_id,
                            const scoped_refptr<CacheStorageCache>& cache,
-                           CacheStorageCache::ErrorType error,
+                           CacheStorageError error,
                            scoped_ptr<CacheStorageCache::Requests> requests);
   void OnCacheBatchCallback(int thread_id,
                             int request_id,
                             const scoped_refptr<CacheStorageCache>& cache,
-                            CacheStorageCache::ErrorType error);
+                            CacheStorageError error);
 
   // Hangs onto a scoped_refptr for the cache if it isn't already doing so.
   // Returns a unique cache_id. Call DropCacheReference when the client is done
   // with this cache.
   CacheID StoreCacheReference(const scoped_refptr<CacheStorageCache>& cache);
   void DropCacheReference(CacheID cache_id);
 
   // Stores blob handles while waiting for acknowledgement of receipt from the
   // renderer.
   void StoreBlobDataHandle(
       scoped_ptr<storage::BlobDataHandle> blob_data_handle);
   void DropBlobDataHandle(std::string uuid);
 
   IDToCacheMap id_to_cache_map_;
   CacheID next_cache_id_ = 0;
 
   UUIDToBlobDataHandleList blob_handle_store_;
 
   scoped_refptr<CacheStorageContextImpl> context_;
 
   DISALLOW_COPY_AND_ASSIGN(CacheStorageDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_DISPATCHER_HOST_H_