Allow to clear session and local storage when not backed on disk

content/browser/dom_storage/dom_storage_context_impl.cc

 // Copyright (c) 2012 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 "content/browser/dom_storage/dom_storage_context_impl.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 
 #include "base/bind.h"
@@ skipping 77 matching lines @@
       return local;
     }
     return NULL;
   }
   return found->second.get();
 }
 
 void DOMStorageContextImpl::GetLocalStorageUsage(
     std::vector<LocalStorageUsageInfo>* infos,
     bool include_file_info) {
-  if (localstorage_directory_.empty())
+  if (localstorage_directory_.empty()) {
+    DOMStorageNamespace* local = GetStorageNamespace(kLocalStorageNamespaceId);
+    std::vector<GURL> origins;
+    local->ReadOrigins(&origins);
+    for (std::vector<GURL>::const_iterator origin_it = origins.begin();

[michaeln, 2016/05/05 00:38:23]

please use a range based for loop for this one

for (const GURL& origin : origins) {
}

[Julien Isorce Samsung, 2016/05/05 11:05:04]

Done.

+         origin_it != origins.end(); ++origin_it) {
+      LocalStorageUsageInfo info;
+      info.origin = *origin_it;
+      infos->push_back(info);
+    }
     return;
+  }
+
   base::FileEnumerator enumerator(localstorage_directory_, false,
                                   base::FileEnumerator::FILES);
   for (base::FilePath path = enumerator.Next(); !path.empty();
        path = enumerator.Next()) {
     if (path.MatchesExtension(DOMStorageArea::kDatabaseFileExtension)) {
       LocalStorageUsageInfo info;
       info.origin = DOMStorageArea::OriginFromDatabaseFileName(path);
       if (include_file_info) {
         base::FileEnumerator::FileInfo find_info = enumerator.GetInfo();
         info.data_size = find_info.GetSize();
         info.last_modified = find_info.GetLastModifiedTime();
       }
       infos->push_back(info);
     }
   }
 }
 
 void DOMStorageContextImpl::GetSessionStorageUsage(
     std::vector<SessionStorageUsageInfo>* infos) {
-  if (!session_storage_database_.get())
+  if (!session_storage_database_.get()) {
+    for (StorageNamespaceMap::const_iterator namespace_it = namespaces_.begin();
+         namespace_it != namespaces_.end(); ++namespace_it) {

[michaeln, 2016/05/05 00:38:23]

might be nice to use range based loops here too

[Julien Isorce Samsung, 2016/05/05 11:05:04]

Done and I used "auto" like in DOMStorageContextImpl::Flush(). Alternatively I
could use "StorageNamespaceMap::value_type" or verbose "std::pair<int64_t,
scoped_refptr<DOMStorageNamespace>>"

+      std::vector<GURL> origins;
+      namespace_it->second->ReadOrigins(&origins);
+      for (std::vector<GURL>::const_iterator origin_it = origins.begin();
+           origin_it != origins.end(); ++origin_it) {
+        SessionStorageUsageInfo info;
+        info.persistent_namespace_id =
+            namespace_it->second->persistent_namespace_id();
+        info.origin = *origin_it;
+        infos->push_back(info);
+      }
+    }
     return;
+  }
+
   std::map<std::string, std::vector<GURL> > namespaces_and_origins;
   session_storage_database_->ReadNamespacesAndOrigins(
       &namespaces_and_origins);
   for (std::map<std::string, std::vector<GURL> >::const_iterator it =
            namespaces_and_origins.begin();
        it != namespaces_and_origins.end(); ++it) {
     for (std::vector<GURL>::const_iterator origin_it = it->second.begin();
          origin_it != it->second.end(); ++origin_it) {
       SessionStorageUsageInfo info;
       info.persistent_namespace_id = it->first;
@@ skipping 289 matching lines @@
   if (!deletable_persistent_namespace_ids_.empty()) {
     task_runner_->PostDelayedTask(
         FROM_HERE, base::Bind(
             &DOMStorageContextImpl::DeleteNextUnusedNamespace,
             this),
         base::TimeDelta::FromSeconds(kSessionStoraceScavengingSeconds));
   }
 }
 
 }  // namespace content