QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/mock_storage_client.cc

 // Copyright (c) 2011 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 "webkit/quota/mock_storage_client.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 29 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(MockStorageClientIDSequencer);
 };
 
 }  // anonymous namespace
 
 MockStorageClient::MockStorageClient(
     QuotaManagerProxy* quota_manager_proxy,
     const MockOriginData* mock_data, size_t mock_data_size)
     : quota_manager_proxy_(quota_manager_proxy),
       id_(MockStorageClientIDSequencer::GetInstance()->NextMockID()),

[kinuko, 2012/01/22 18:35:31]

I suspect this NextModkID() routine no longer works?

[Mike West, 2012/01/22 20:54:38]

Why not?

Honestly, I'm not sure it was used in the first place, so I wouldn't mind
ripping it out if you like. Specifying the ID manually makes more sense to me,
so if there's not a good reason not to...

       mock_time_counter_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+  Populate_(mock_data, mock_data_size);
+}
+
+MockStorageClient::MockStorageClient(
+    QuotaManagerProxy* quota_manager_proxy,
+    const MockOriginData* mock_data, QuotaClient::ID id, size_t mock_data_size)
+    : quota_manager_proxy_(quota_manager_proxy),
+      id_(id),
+      mock_time_counter_(0),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+  Populate_(mock_data, mock_data_size);
+}
+
+void MockStorageClient::Populate_(const MockOriginData* mock_data,
+    size_t mock_data_size) {
   for (size_t i = 0; i < mock_data_size; ++i) {
     origin_data_[make_pair(GURL(mock_data[i].origin), mock_data[i].type)] =
         mock_data[i].usage;
   }
 }
 
 MockStorageClient::~MockStorageClient() {}
 
 void MockStorageClient::AddOriginAndNotify(
     const GURL& origin_url, StorageType type, int64 size) {
@@ skipping 130 matching lines @@
     int64 delta = itr->second;
     quota_manager_proxy_->
         NotifyStorageModified(id(), origin_url, type, -delta);
     origin_data_.erase(itr);
   }
 
   callback.Run(kQuotaStatusOk);
 }
 
 }  // namespace quota