[Storage] Android - ManageSpace UI, Important Origins, and CBD Dialog

components/browsing_data/storage_partition_http_cache_data_remover.cc

 // 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.
 
 #include "components/browsing_data/storage_partition_http_cache_data_remover.h"
 
 #include "components/browsing_data/conditional_cache_deletion_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/base/sdch_manager.h"
@@ skipping 169 matching lines @@
           if (!url_predicate_.is_null()) {
             (new ConditionalCacheDeletionHelper(
                 cache_,
                 ConditionalCacheDeletionHelper::CreateURLAndTimeCondition(
                     url_predicate_,
                     delete_begin_,
                     delete_end_)))->DeleteAndDestroySelfWhenFinished(
                         base::Bind(
                             &StoragePartitionHttpCacheDataRemover::DoClearCache,
                             base::Unretained(this)));
+            rv = net::ERR_IO_PENDING;

[msramek, 2016/05/17 14:02:24]

Thanks for fixing this! But it should be:

rv = (new ConditionalCache...)->DeleteAndDestroySelfWhenFinished(...).

It is true that |DeleteAndDestroySelfWhenFinished| currently only returns
net::ERR_IO_PENDING, but it could conceivably return any other net error code.

[dmurph, 2016/05/18 23:28:00]

Done.

           } else if (delete_begin_.is_null() && delete_end_.is_max()) {
             rv = cache_->DoomAllEntries(base::Bind(
                 &StoragePartitionHttpCacheDataRemover::DoClearCache,
                 base::Unretained(this)));
           } else {
             rv = cache_->DoomEntriesBetween(
                 delete_begin_, delete_end_,
                 base::Bind(
                     &StoragePartitionHttpCacheDataRemover::DoClearCache,
                     base::Unretained(this)));
@@ skipping 98 matching lines @@
       default: {
         NOTREACHED() << "bad state";
         next_cache_state_ = STATE_NONE;  // Stop looping.
         return;
       }
     }
   }
 }
 
 }  // namespace browsing_data