1 files changed, 12 insertions, 18 deletions

diff --git a/webkit/quota/mock_storage_client.cc b/webkit/quota/mock_storage_client.cc
index 74f5e28..ee1a0b1 100644
--- a/webkit/quota/mock_storage_client.cc
+++ b/webkit/quota/mock_storage_client.cc
@@ -19,8 +19,6 @@ namespace quota {
 
 namespace {
 
-using std::make_pair;
-
 class MockStorageClientIDSequencer {
  public:
   static MockStorageClientIDSequencer* GetInstance() {
@@ -56,21 +54,17 @@ MockStorageClient::~MockStorageClient() {
 
 void MockStorageClient::AddMockOriginData(
     const GURL& origin_url, StorageType type, int64 size) {
-  origin_data_[make_pair(origin_url, type)] = size;
+  origin_data_.insert(std::make_pair(origin_url, MockOriginData(type, size)));
 }
 
 void MockStorageClient::ModifyMockOriginDataSize(
     const GURL& origin_url, StorageType type, int64 delta) {
-  OriginDataMap::iterator find = origin_data_.find(make_pair(origin_url, type));
-  if (find == origin_data_.end()) {
+  std::map<GURL, MockOriginData>::iterator find = origin_data_.find(origin_url);
+  if (find == origin_data_.end() || find->second.type != type) {
     DCHECK(delta >= 0);
     AddMockOriginData(origin_url, type, delta);
     return;
   }
-  find->second += delta;
-  DCHECK(find->second >= 0);
-
-  // TODO(tzik): Check quota to prevent usage exceed
   quota_manager_proxy_->NotifyStorageModified(id(), origin_url, type, delta);
 }
 
@@ -115,11 +109,11 @@ void MockStorageClient::RunGetOriginUsage(
     const GURL& origin_url, StorageType type, GetUsageCallback* callback_ptr) {
   usage_callbacks_.erase(callback_ptr);
   scoped_ptr<GetUsageCallback> callback(callback_ptr);
-  OriginDataMap::iterator find = origin_data_.find(make_pair(origin_url, type));
+  std::map<GURL, MockOriginData>::iterator find = origin_data_.find(origin_url);
   if (find == origin_data_.end()) {
     callback->Run(0);
   } else {
-    callback->Run(find->second);
+    callback->Run(find->second.usage);
   }
 }
 
@@ -128,10 +122,10 @@ void MockStorageClient::RunGetOriginsForType(
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   origins_callbacks_.erase(callback_ptr);
   std::set<GURL> origins;
-  for (OriginDataMap::iterator iter = origin_data_.begin();
+  for (std::map<GURL, MockOriginData>::iterator iter = origin_data_.begin();
        iter != origin_data_.end(); ++iter) {
-    if (type == iter->first.second)
-      origins.insert(iter->first.first);
+    if (type == iter->second.type)
+      origins.insert(iter->first);
   }
   callback->Run(origins);
 }
@@ -142,11 +136,11 @@ void MockStorageClient::RunGetOriginsForHost(
   scoped_ptr<GetOriginsCallback> callback(callback_ptr);
   origins_callbacks_.erase(callback_ptr);
   std::set<GURL> origins;
-  for (OriginDataMap::iterator iter = origin_data_.begin();
+  for (std::map<GURL, MockOriginData>::iterator iter = origin_data_.begin();
        iter != origin_data_.end(); ++iter) {
-    std::string host_or_spec = net::GetHostOrSpecFromURL(iter->first.first);
-    if (type == iter->first.second && host == host_or_spec)
-      origins.insert(iter->first.first);
+    std::string host_or_spec = net::GetHostOrSpecFromURL(iter->first);
+    if (type == iter->second.type && host == host_or_spec)
+      origins.insert(iter->first);
   }
   callback->Run(origins);
 }