[ServiceWorkerCache] Cache and CacheStorage creation UMA

content/browser/service_worker/service_worker_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/service_worker/service_worker_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 156 matching lines @@
   bool delay_backend_creation_;
   ErrorCallback backend_creation_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestServiceWorkerCache);
 };
 
 class ServiceWorkerCacheTest : public testing::Test {
  public:
   ServiceWorkerCacheTest()
       : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
-        callback_error_(ServiceWorkerCache::ErrorTypeOK),
+        callback_error_(ServiceWorkerCache::ERROR_TYPE_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 100 matching lines @@
     cache_->Put(CopyFetchRequest(request),
                 CopyFetchResponse(response),
                 base::Bind(&ServiceWorkerCacheTest::ResponseAndErrorCallback,
                            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_ == ServiceWorkerCache::ErrorTypeOK;
+    return callback_error_ == ServiceWorkerCache::ERROR_TYPE_OK;
   }
 
   bool Match(const ServiceWorkerFetchRequest& request) {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Match(CopyFetchRequest(request),
                   base::Bind(&ServiceWorkerCacheTest::ResponseAndErrorCallback,
                              base::Unretained(this),
                              base::Unretained(loop.get())));
     loop->Run();
 
-    return callback_error_ == ServiceWorkerCache::ErrorTypeOK;
+    return callback_error_ == ServiceWorkerCache::ERROR_TYPE_OK;
   }
 
   bool Delete(const ServiceWorkerFetchRequest& request) {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Delete(CopyFetchRequest(request),
                    base::Bind(&ServiceWorkerCacheTest::ErrorTypeCallback,
                               base::Unretained(this),
                               base::Unretained(loop.get())));
     loop->Run();
 
-    return callback_error_ == ServiceWorkerCache::ErrorTypeOK;
+    return callback_error_ == ServiceWorkerCache::ERROR_TYPE_OK;
   }
 
   bool Keys() {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Keys(base::Bind(&ServiceWorkerCacheTest::RequestsCallback,
                             base::Unretained(this),
                             base::Unretained(loop.get())));
     loop->Run();
 
-    return callback_error_ == ServiceWorkerCache::ErrorTypeOK;
+    return callback_error_ == ServiceWorkerCache::ERROR_TYPE_OK;
   }
 
   bool Close() {
     scoped_ptr<base::RunLoop> loop(new base::RunLoop());
 
     cache_->Close(base::Bind(&ServiceWorkerCacheTest::CloseCallback,
                              base::Unretained(this),
                              base::Unretained(loop.get())));
     loop->Run();
     return callback_closed_;
@@ skipping 20 matching lines @@
   }
 
   void ResponseAndErrorCallback(
       base::RunLoop* run_loop,
       ServiceWorkerCache::ErrorType error,
       scoped_ptr<ServiceWorkerResponse> response,
       scoped_ptr<storage::BlobDataHandle> body_handle) {
     callback_error_ = error;
     callback_response_ = response.Pass();
     callback_response_data_.reset();
-    if (error == ServiceWorkerCache::ErrorTypeOK &&
+    if (error == ServiceWorkerCache::ERROR_TYPE_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_);
@@ skipping 124 matching lines @@
   cache_->Put(CopyFetchRequest(body_request_),
               CopyFetchResponse(body_response_),
               base::Bind(&ServiceWorkerCacheTestP::ResponseAndErrorCallback,
                          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(ServiceWorkerCache::ErrorTypeOK, callback_error_);
+  EXPECT_EQ(ServiceWorkerCache::ERROR_TYPE_OK, callback_error_);
 }
 
 TEST_P(ServiceWorkerCacheTestP, 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 297 matching lines @@
   EXPECT_EQ(1, callback_response_->status_code);
   close_loop2->Run();
   EXPECT_EQ(2, callback_response_->status_code);
 }
 
 INSTANTIATE_TEST_CASE_P(ServiceWorkerCacheTest,
                         ServiceWorkerCacheTestP,
                         ::testing::Values(false, true));
 
 }  // namespace content