Added quota client for serviceworker. Enables 'clear past <time> data'.

storage/browser/quota/quota_manager.cc

 // Copyright 2013 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 "storage/browser/quota/quota_manager.h"
 
 #include <algorithm>
 #include <deque>
 #include <functional>
 #include <set>
@@ skipping 538 matching lines @@
         weak_factory_(this) {}
 
  protected:
   virtual void Run() OVERRIDE {
     error_count_ = 0;
     remaining_clients_ = manager()->clients_.size();
     for (QuotaClientList::iterator iter = manager()->clients_.begin();
          iter != manager()->clients_.end(); ++iter) {
       if (quota_client_mask_ & (*iter)->id()) {
         (*iter)->DeleteOriginData(
-            origin_, type_,
+            origin_,
+            type_,
             base::Bind(&OriginDataDeleter::DidDeleteOriginData,
-                       weak_factory_.GetWeakPtr()));
+                       weak_factory_.GetWeakPtr(),
+                       static_cast<int>((*iter)->id())));

[jsbell, 2014/10/13 20:54:26]

Is the logging below the only reason for passing the ID through?

If so, remove?

If not, consider changing this to a range-based for loop, e.g.

for(const QuotaClient* client : manager()->clients_) {
  ...
}

[dmurph, 2014/10/14 00:16:31]

Removed, sorry, debugging stuff still around.

       } else {
         ++skipped_clients_;
         if (--remaining_clients_ == 0)
           CallCompleted();
       }
     }
   }
 
   virtual void Completed() OVERRIDE {
+    DLOG(ERROR) << "Error count " << error_count_;

[jsbell, 2014/10/13 20:54:26]

remove?

[dmurph, 2014/10/14 00:16:31]

Done.

     if (error_count_ == 0) {
       // Only remove the entire origin if we didn't skip any client types.
       if (skipped_clients_ == 0)
         manager()->DeleteOriginFromDatabase(origin_, type_);
       callback_.Run(kQuotaStatusOk);
     } else {
       callback_.Run(kQuotaErrorInvalidModification);
     }
     DeleteSoon();
   }
 
   virtual void Aborted() OVERRIDE {
     callback_.Run(kQuotaErrorAbort);
     DeleteSoon();
   }
 
  private:
-  void DidDeleteOriginData(QuotaStatusCode status) {
+  void DidDeleteOriginData(int id, QuotaStatusCode status) {
+    DLOG(ERROR) << "Got status " << status << " from client " << id;

[jsbell, 2014/10/13 20:54:26]

remove?

[dmurph, 2014/10/14 00:16:32]

Done.

     DCHECK_GT(remaining_clients_, 0);
 
     if (status != kQuotaStatusOk)
       ++error_count_;
 
     if (--remaining_clients_ == 0)
       CallCompleted();
   }
 
   QuotaManager* manager() const {
@@ skipping 36 matching lines @@
     for (QuotaClientList::iterator iter = manager()->clients_.begin();
          iter != manager()->clients_.end(); ++iter) {
       (*iter)->GetOriginsForHost(
           type_, host_,
           base::Bind(&HostDataDeleter::DidGetOriginsForHost,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
   virtual void Completed() OVERRIDE {
+    DLOG(ERROR) << "Error count " << error_count_;

[jsbell, 2014/10/13 20:54:26]

remove?

[dmurph, 2014/10/14 00:16:32]

Done.

     if (error_count_ == 0) {
       callback_.Run(kQuotaStatusOk);
     } else {
       callback_.Run(kQuotaErrorInvalidModification);
     }
     DeleteSoon();
   }
 
   virtual void Aborted() OVERRIDE {
     callback_.Run(kQuotaErrorAbort);
@@ skipping 967 matching lines @@
   // |database_|, therefore we can be sure that database_ is alive when this
   // task runs.
   base::PostTaskAndReplyWithResult(
       db_thread_.get(),
       from_here,
       base::Bind(task, base::Unretained(database_.get())),
       reply);
 }
 
 }  // namespace storage