service worker: Remove instrumentation code for resource size debugging

The bug was fixed and we don't observe flakiness any longer.
Remove the instrumentations.

Tbr: kinuko@chromium.org
Bug: 946719
Change-Id: I7f31002516f2507a7205ab5c2680ebcf3f748e2e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2094375
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748129}

components/services/storage/public/mojom/service_worker_database.mojom

@@ -65,8 +65,7 @@ struct ServiceWorkerRegistrationData {
 struct ServiceWorkerResourceRecord {
   int64 resource_id = blink.mojom.kInvalidServiceWorkerResourceId;
   url.mojom.Url url;
-  // Signed so we can store ResourceRecordErrorState. When stored to the
-  // database, this value should always be >= 0.
-  // TODO(crbug.com/946719): Change to uint64 when the bug is fixed.
+  // |size_bytes| could be -1 when there was an error while loading the worker
+  // script data, but when stored to the database this value is always >= 0.
   int64 size_bytes = 0;
 };

content/browser/service_worker/service_worker_script_cache_map.cc

@@ -16,21 +16,6 @@
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
-namespace {
-
-// Represents an error state. Each enum instance should be a negative
-// value.  This is just temporary for debugging.
-// TODO(crbug.com/946719): Remove this once we fix the bug.
-enum class ResourceRecordErrorState : int64_t {
-  // We don't use -1 here to catch an untracked usage of -1 as an error
-  // code.
-  kStartedCaching = -2,
-  kFinishedCachingNoBytesWritten = -3,
-  kFinishedCachingNoContext = -4,
-};
-
-}  // namespace
-
 namespace content {
 
 ServiceWorkerScriptCacheMap::ServiceWorkerScriptCacheMap(
@@ -57,9 +42,8 @@ void ServiceWorkerScriptCacheMap::NotifyStartedCaching(const GURL& url,
       << owner_->status();
   if (!context_)
     return;  // Our storage has been wiped via DeleteAndStartOver.
-  resource_map_[url] = storage::mojom::ServiceWorkerResourceRecord::New(
-      resource_id, url,
-      static_cast<int64_t>(ResourceRecordErrorState::kStartedCaching));
+  resource_map_[url] =
+      storage::mojom::ServiceWorkerResourceRecord::New(resource_id, url, -1);
   context_->registry()->StoreUncommittedResourceId(resource_id,
                                                    owner_->scope().GetOrigin());
 }
@@ -75,17 +59,9 @@ void ServiceWorkerScriptCacheMap::NotifyFinishedCaching(
   DCHECK(owner_->status() == ServiceWorkerVersion::NEW ||
          owner_->status() == ServiceWorkerVersion::INSTALLING ||
          owner_->status() == ServiceWorkerVersion::REDUNDANT);
-  if (!context_) {
-    // For debugging. See https://crbug.com/946719.
-    DCHECK(resource_map_.find(url) != resource_map_.end());
-    storage::mojom::ServiceWorkerResourceRecordPtr& record = resource_map_[url];
-    if (record->size_bytes ==
-        static_cast<int64_t>(ResourceRecordErrorState::kStartedCaching)) {
-      record->size_bytes = static_cast<int64_t>(
-          ResourceRecordErrorState::kFinishedCachingNoContext);
-    }
+  if (!context_)
     return;  // Our storage has been wiped via DeleteAndStartOver.
-  }
+
   if (net_error != net::OK) {
     context_->registry()->DoomUncommittedResource(LookupResourceId(url));
     resource_map_.erase(url);
@@ -93,11 +69,8 @@ void ServiceWorkerScriptCacheMap::NotifyFinishedCaching(
       main_script_net_error_ = net_error;
       main_script_status_message_ = status_message;
     }
-  } else if (size_bytes >= 0) {
-    resource_map_[url]->size_bytes = size_bytes;
   } else {
-    resource_map_[url]->size_bytes = static_cast<int64_t>(
-        ResourceRecordErrorState::kFinishedCachingNoBytesWritten);
+    resource_map_[url]->size_bytes = size_bytes;
   }
 }
 

content/browser/service_worker/service_worker_storage_unittest.cc

@@ -62,8 +62,6 @@ namespace service_worker_storage_unittest {
 using RegistrationData = storage::mojom::ServiceWorkerRegistrationData;
 using ResourceRecord = storage::mojom::ServiceWorkerResourceRecordPtr;
 
-// TODO(crbug.com/946719): Change the type of |size_bytes| to uint64_t when
-// the bug is fixed.
 ResourceRecord CreateResourceRecord(int64_t resource_id,
                                     const GURL& url,
                                     int64_t size_bytes) {