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

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

Both error codes have similar values and it's not necessary to separate them.

BUG=425505
TEST=content_unittests --gtest_filter=CacheStorage*
TEST=run-webkit-tests http/tests/cachestorage/

Committed: https://crrev.com/77d218aa592546b8845cf75b4506999826444ee3
Cr-Commit-Position: refs/heads/master@{#328959}

[nhiroki, 2015-05-08 05:13:53]

Patchset #1 (id:1) has been deleted

[nhiroki, 2015-05-08 05:14:18]

Patchset #1 (id:20001) has been deleted

[nhiroki, 2015-05-08 05:25:16]

Patchset #1 (id:40001) has been deleted

[nhiroki, 2015-05-08 05:34:26]

nhiroki@chromium.org changed reviewers:
+ jkarlin@chromium.org

[nhiroki, 2015-05-08 07:31:39]

Hi jkarlin@, can you review this?

I'd like to clean up these error codes so that I can more easily introduce
"TypeError" for the batch operation.
Please also see my comment in https://codereview.chromium.org/1113303003/#msg15.

Thanks!

[nhiroki, 2015-05-08 07:33:03]

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
File content/browser/cache_storage/cache_storage.cc (left):

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage.cc:580:
CACHE_STORAGE_ERROR_CLOSING);
Are we able to replace "CLOSING" with "STORAGE"? This error is used only here
and it's great if we can remove this.

[jkarlin, 2015-05-08 12:38:19]

Yay, happy to see this. lgtm with nits.

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
File content/browser/cache_storage/cache_storage.cc (left):

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage.cc:580:
CACHE_STORAGE_ERROR_CLOSING);
On 2015/05/08 07:33:03, nhiroki wrote:
> Are we able to replace "CLOSING" with "STORAGE"? This error is used only here
> and it's great if we can remove this.

Yes, I think that's fine. I see an error in the below histogram though, it's
supposed to be above this condition! Otherwise it always reports true. I'll fix
that in a separate CL.

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
File content/browser/cache_storage/cache_storage_cache.h (right):

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage_cache.h:42: typedef
base::Callback<void(CacheStorageError)> ErrorCallback;
using ErrorCallback = ...

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage_cache.h:43: typedef
base::Callback<void(CacheStorageError,
ditto

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
File content/browser/cache_storage/cache_storage_dispatcher_host.cc (right):

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage_dispatcher_host.cc:35: return
blink::WebServiceWorkerCacheErrorNotFound;
Add a TODO that we need an ERROR_STORAGE WebServiceWorkerCacheError equivalent.

[nhiroki, 2015-05-08 14:14:49]

Thank you for reviewing!

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
File content/browser/cache_storage/cache_storage.cc (left):

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage.cc:580:
CACHE_STORAGE_ERROR_CLOSING);
On 2015/05/08 12:38:19, jkarlin wrote:
> On 2015/05/08 07:33:03, nhiroki wrote:
> > Are we able to replace "CLOSING" with "STORAGE"? This error is used only
here
> > and it's great if we can remove this.
> 
> Yes, I think that's fine. I see an error in the below histogram though, it's
> supposed to be above this condition! Otherwise it always reports true. I'll
fix
> that in a separate CL.

I see, thanks!

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
File content/browser/cache_storage/cache_storage_cache.h (right):

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage_cache.h:42: typedef
base::Callback<void(CacheStorageError)> ErrorCallback;
On 2015/05/08 12:38:19, jkarlin wrote:
> using ErrorCallback = ...

Done.

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage_cache.h:43: typedef
base::Callback<void(CacheStorageError,
On 2015/05/08 12:38:19, jkarlin wrote:
> ditto

Done.

[nhiroki, 2015-05-08 14:15:10]

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
File content/browser/cache_storage/cache_storage_dispatcher_host.cc (right):

https://codereview.chromium.org/1132683003/diff/60001/content/browser/cache_s...
content/browser/cache_storage/cache_storage_dispatcher_host.cc:35: return
blink::WebServiceWorkerCacheErrorNotFound;
On 2015/05/08 12:38:19, jkarlin wrote:
> Add a TODO that we need an ERROR_STORAGE WebServiceWorkerCacheError
equivalent.

Done.

[nhiroki, 2015-05-08 14:15:18]

The CQ bit was checked by nhiroki@chromium.org

[nhiroki, 2015-05-08 14:15:19]

The patchset sent to the CQ was uploaded after l-g-t-m from jkarlin@chromium.org
Link to the patchset: https://codereview.chromium.org/1132683003/#ps80001
(title: "fix more")

[commit-bot: I haz the power, 2015-05-08 14:15:31]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1132683003/80001

[commit-bot: I haz the power, 2015-05-08 15:29:07]

Committed patchset #2 (id:80001)

[commit-bot: I haz the power, 2015-05-08 15:30:51]

Patchset 2 (id:??) landed as
https://crrev.com/77d218aa592546b8845cf75b4506999826444ee3
Cr-Commit-Position: refs/heads/master@{#328959}