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

content/browser/cache_storage/cache_storage_cache_unittest.cc

 // Copyright 2014 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 "content/browser/cache_storage/cache_storage_cache.h"
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 157 matching lines @@
   bool delay_backend_creation_;
   ErrorCallback backend_creation_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCacheStorageCache);
 };
 
 class CacheStorageCacheTest : public testing::Test {
  public:
   CacheStorageCacheTest()
       : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
-        callback_error_(CacheStorageCache::ERROR_TYPE_OK),
+        callback_error_(CACHE_STORAGE_OK),
         callback_closed_(false) {}
 
   void SetUp() override {
     ChromeBlobStorageContext* blob_storage_context =
         ChromeBlobStorageContext::GetFor(&browser_context_);
     // Wait for chrome_blob_storage_context to finish initializing.
     base::RunLoop().RunUntilIdle();
     blob_storage_context_ = blob_storage_context->context();
 
     quota_manager_proxy_ = new MockQuotaManagerProxy(
@@ skipping 78 matching lines @@
 
     cache_->Put(
         CopyFetchRequest(request), CopyFetchResponse(response),
         base::Bind(&CacheStorageCacheTest::ErrorTypeCallback,
                    base::Unretained(this), base::Unretained(loop.get())));
     // TODO(jkarlin): These functions should use base::RunLoop().RunUntilIdle()
     // once the cache uses a passed in MessageLoopProxy instead of the CACHE
     // thread.
     loop->Run();
 
-    return callback_error_ == CacheStorageCache::ERROR_TYPE_OK;
+    return callback_error_ == CACHE_STORAGE_OK;
   }
 
   bool Match(const ServiceWorkerFetchRequest& request) {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Match(
         CopyFetchRequest(request),
         base::Bind(&CacheStorageCacheTest::ResponseAndErrorCallback,
                    base::Unretained(this), base::Unretained(loop.get())));
     loop->Run();
 
-    return callback_error_ == CacheStorageCache::ERROR_TYPE_OK;
+    return callback_error_ == CACHE_STORAGE_OK;
   }
 
   bool Delete(const ServiceWorkerFetchRequest& request) {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Delete(
         CopyFetchRequest(request),
         base::Bind(&CacheStorageCacheTest::ErrorTypeCallback,
                    base::Unretained(this), base::Unretained(loop.get())));
     loop->Run();
 
-    return callback_error_ == CacheStorageCache::ERROR_TYPE_OK;
+    return callback_error_ == CACHE_STORAGE_OK;
   }
 
   bool Keys() {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Keys(base::Bind(&CacheStorageCacheTest::RequestsCallback,
                             base::Unretained(this),
                             base::Unretained(loop.get())));
     loop->Run();
 
-    return callback_error_ == CacheStorageCache::ERROR_TYPE_OK;
+    return callback_error_ == CACHE_STORAGE_OK;
   }
 
   bool Close() {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Close(base::Bind(&CacheStorageCacheTest::CloseCallback,
                              base::Unretained(this),
                              base::Unretained(loop.get())));
     loop->Run();
     return callback_closed_;
   }
 
   void RequestsCallback(base::RunLoop* run_loop,
-                        CacheStorageCache::ErrorType error,
+                        CacheStorageError error,
                         scoped_ptr<CacheStorageCache::Requests> requests) {
     callback_error_ = error;
     callback_strings_.clear();
     if (requests) {
       for (size_t i = 0u; i < requests->size(); ++i)
         callback_strings_.push_back(requests->at(i).url.spec());
     }
     if (run_loop)
       run_loop->Quit();
   }
 
-  void ErrorTypeCallback(base::RunLoop* run_loop,
-                         CacheStorageCache::ErrorType error) {
+  void ErrorTypeCallback(base::RunLoop* run_loop, CacheStorageError error) {
     callback_error_ = error;
     if (run_loop)
       run_loop->Quit();
   }
 
   void SequenceCallback(int sequence,
                         int* sequence_out,
                         base::RunLoop* run_loop,
-                        CacheStorageCache::ErrorType error) {
+                        CacheStorageError error) {
     *sequence_out = sequence;
     callback_error_ = error;
     if (run_loop)
       run_loop->Quit();
   }
 
   void ResponseAndErrorCallback(
       base::RunLoop* run_loop,
-      CacheStorageCache::ErrorType error,
+      CacheStorageError error,
       scoped_ptr<ServiceWorkerResponse> response,
       scoped_ptr<storage::BlobDataHandle> body_handle) {
     callback_error_ = error;
     callback_response_ = response.Pass();
     callback_response_data_.reset();
-    if (error == CacheStorageCache::ERROR_TYPE_OK &&
-        !callback_response_->blob_uuid.empty()) {
+    if (error == CACHE_STORAGE_OK && !callback_response_->blob_uuid.empty())
       callback_response_data_ = body_handle.Pass();
-    }
 
     if (run_loop)
       run_loop->Quit();
   }
 
   void CloseCallback(base::RunLoop* run_loop) {
     EXPECT_FALSE(callback_closed_);
     callback_closed_ = true;
     if (run_loop)
       run_loop->Quit();
@@ skipping 49 matching lines @@
   base::ScopedTempDir temp_dir_;
   scoped_refptr<TestCacheStorageCache> cache_;
 
   ServiceWorkerFetchRequest body_request_;
   ServiceWorkerResponse body_response_;
   ServiceWorkerFetchRequest no_body_request_;
   ServiceWorkerResponse no_body_response_;
   scoped_ptr<storage::BlobDataHandle> blob_handle_;
   std::string expected_blob_data_;
 
-  CacheStorageCache::ErrorType callback_error_;
+  CacheStorageError callback_error_;
   scoped_ptr<ServiceWorkerResponse> callback_response_;
   scoped_ptr<storage::BlobDataHandle> callback_response_data_;
   std::vector<std::string> callback_strings_;
   bool callback_closed_;
 };
 
 class CacheStorageCacheTestP : public CacheStorageCacheTest,
                                public testing::WithParamInterface<bool> {
   bool MemoryOnly() override { return !GetParam(); }
 };
@@ skipping 34 matching lines @@
   scoped_ptr<base::RunLoop> loop(new base::RunLoop());
   cache_->Put(CopyFetchRequest(body_request_),
               CopyFetchResponse(body_response_),
               base::Bind(&CacheStorageCacheTestP::ErrorTypeCallback,
                          base::Unretained(this), base::Unretained(loop.get())));
   // The handle should be held by the cache now so the deref here should be
   // okay.
   blob_handle_.reset();
   loop->Run();
 
-  EXPECT_EQ(CacheStorageCache::ERROR_TYPE_OK, callback_error_);
+  EXPECT_EQ(CACHE_STORAGE_OK, callback_error_);
 }
 
 TEST_P(CacheStorageCacheTestP, PutReplace) {
   EXPECT_TRUE(Put(body_request_, no_body_response_));
   EXPECT_TRUE(Match(body_request_));
   EXPECT_FALSE(callback_response_data_);
 
   EXPECT_TRUE(Put(body_request_, body_response_));
   EXPECT_TRUE(Match(body_request_));
   EXPECT_TRUE(callback_response_data_);
@@ skipping 291 matching lines @@
   EXPECT_EQ(1, sequence_out);
   close_loop2->Run();
   EXPECT_EQ(2, sequence_out);
 }
 
 INSTANTIATE_TEST_CASE_P(CacheStorageCacheTest,
                         CacheStorageCacheTestP,
                         ::testing::Values(false, true));
 
 }  // namespace content