QuotaManager::DeleteOriginData now allows deletion of specific QuotaClients

webkit/quota/mock_storage_client.cc

Index: webkit/quota/mock_storage_client.cc
diff --git a/webkit/quota/mock_storage_client.cc b/webkit/quota/mock_storage_client.cc
index 66ed587c11321d60bbf064591f6ac975489fde25..31855b16edac70fcad7b82776ce0ac9c3d99ffea 100644
--- a/webkit/quota/mock_storage_client.cc
+++ b/webkit/quota/mock_storage_client.cc
@@ -50,6 +50,21 @@ MockStorageClient::MockStorageClient(
       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;