Cache Storage API: Hook up to chrome://settings/cookies

chrome/browser/browsing_data/cookies_tree_model_unittest.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 "chrome/browser/browsing_data/cookies_tree_model.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_service_worker_helper.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ skipping 44 matching lines @@
     mock_browsing_data_indexed_db_helper_ =
         new MockBrowsingDataIndexedDBHelper(profile_.get());
     mock_browsing_data_file_system_helper_ =
         new MockBrowsingDataFileSystemHelper(profile_.get());
     mock_browsing_data_quota_helper_ =
         new MockBrowsingDataQuotaHelper(profile_.get());
     mock_browsing_data_channel_id_helper_ =
         new MockBrowsingDataChannelIDHelper();
     mock_browsing_data_service_worker_helper_ =
         new MockBrowsingDataServiceWorkerHelper(profile_.get());
+    mock_browsing_data_cache_storage_helper_ =
+        new MockBrowsingDataCacheStorageHelper(profile_.get());
     mock_browsing_data_flash_lso_helper_ =
         new MockBrowsingDataFlashLSOHelper(profile_.get());
 
     const char kExtensionScheme[] = "extensionscheme";
     scoped_refptr<content_settings::CookieSettings> cookie_settings =
         new content_settings::CookieSettings(
             profile_->GetHostContentSettingsMap(), profile_->GetPrefs(),
             kExtensionScheme);
 #if defined(ENABLE_EXTENSIONS)
     special_storage_policy_ =
         new ExtensionSpecialStoragePolicy(cookie_settings.get());
 #endif
   }
 
   void TearDown() override {
     mock_browsing_data_service_worker_helper_ = nullptr;
+    mock_browsing_data_cache_storage_helper_ = nullptr;
     mock_browsing_data_channel_id_helper_ = nullptr;
     mock_browsing_data_quota_helper_ = nullptr;
     mock_browsing_data_file_system_helper_ = nullptr;
     mock_browsing_data_indexed_db_helper_ = nullptr;
     mock_browsing_data_appcache_helper_ = nullptr;
     mock_browsing_data_session_storage_helper_ = nullptr;
     mock_browsing_data_local_storage_helper_ = nullptr;
     mock_browsing_data_database_helper_ = nullptr;
     mock_browsing_data_flash_lso_helper_ = nullptr;
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() {
-    LocalDataContainer* container = new LocalDataContainer(
-        mock_browsing_data_cookie_helper_.get(),
-        mock_browsing_data_database_helper_.get(),
-        mock_browsing_data_local_storage_helper_.get(),
-        mock_browsing_data_session_storage_helper_.get(),
-        mock_browsing_data_appcache_helper_.get(),
-        mock_browsing_data_indexed_db_helper_.get(),
-        mock_browsing_data_file_system_helper_.get(),
-        mock_browsing_data_quota_helper_.get(),
-        mock_browsing_data_channel_id_helper_.get(),
-        mock_browsing_data_service_worker_helper_.get(),
-        mock_browsing_data_flash_lso_helper_.get());
+    LocalDataContainer* container =
+        new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+                               mock_browsing_data_database_helper_.get(),
+                               mock_browsing_data_local_storage_helper_.get(),
+                               mock_browsing_data_session_storage_helper_.get(),
+                               mock_browsing_data_appcache_helper_.get(),
+                               mock_browsing_data_indexed_db_helper_.get(),
+                               mock_browsing_data_file_system_helper_.get(),
+                               mock_browsing_data_quota_helper_.get(),
+                               mock_browsing_data_channel_id_helper_.get(),
+                               mock_browsing_data_service_worker_helper_.get(),
+                               mock_browsing_data_cache_storage_helper_.get(),
+                               mock_browsing_data_flash_lso_helper_.get());
 
     CookiesTreeModel* cookies_model =
         new CookiesTreeModel(container, special_storage_policy(), false);
     mock_browsing_data_cookie_helper_->
         AddCookieSamples(GURL("http://foo1"), "A=1");
     mock_browsing_data_cookie_helper_->
         AddCookieSamples(GURL("http://foo2"), "B=1");
     mock_browsing_data_cookie_helper_->
         AddCookieSamples(GURL("http://foo3"), "C=1");
     mock_browsing_data_cookie_helper_->Notify();
     mock_browsing_data_database_helper_->AddDatabaseSamples();
     mock_browsing_data_database_helper_->Notify();
     mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
     mock_browsing_data_local_storage_helper_->Notify();
     mock_browsing_data_session_storage_helper_->AddLocalStorageSamples();
     mock_browsing_data_session_storage_helper_->Notify();
     mock_browsing_data_indexed_db_helper_->AddIndexedDBSamples();
     mock_browsing_data_indexed_db_helper_->Notify();
     mock_browsing_data_file_system_helper_->AddFileSystemSamples();
     mock_browsing_data_file_system_helper_->Notify();
     mock_browsing_data_quota_helper_->AddQuotaSamples();
     mock_browsing_data_quota_helper_->Notify();
     mock_browsing_data_channel_id_helper_->AddChannelIDSample(
         "sbc1");
     mock_browsing_data_channel_id_helper_->AddChannelIDSample(
         "sbc2");
     mock_browsing_data_channel_id_helper_->Notify();
     mock_browsing_data_service_worker_helper_->AddServiceWorkerSamples();
     mock_browsing_data_service_worker_helper_->Notify();
+    mock_browsing_data_cache_storage_helper_->AddCacheStorageSamples();
+    mock_browsing_data_cache_storage_helper_->Notify();
     mock_browsing_data_flash_lso_helper_->AddFlashLSODomain("xyz.com");
     mock_browsing_data_flash_lso_helper_->Notify();
 
     {
-      SCOPED_TRACE("Initial State 3 cookies, 2 databases, 2 local storages, "
-                   "2 session storages, 2 indexed DBs, 3 filesystems, "
-                   "2 quotas, 2 server bound certs, 2 service workers, "
-                   "1 Flash LSO");
-      // 59 because there's the root, then
+      SCOPED_TRACE(
+          "Initial State 3 cookies, 2 databases, 2 local storages, "
+          "2 session storages, 2 indexed DBs, 3 filesystems, "
+          "2 quotas, 2 server bound certs, 2 service workers, "
+          "2 cache storages, 1 Flash LSO");
+      // 65 because there's the root, then
+      // cshost1 -> cache storage -> https://cshost1:1/
+      // cshost2 -> cache storage -> https://cshost2:2/
       // foo1 -> cookies -> a,
       // foo2 -> cookies -> b,
       // foo3 -> cookies -> c,
       // dbhost1 -> database -> db1,
       // dbhost2 -> database -> db2,
       // host1 -> localstorage -> http://host1:1/,
       //       -> sessionstorage -> http://host1:1/,
       // host2 -> localstorage -> http://host2:2/.
       //       -> sessionstorage -> http://host2:2/,
       // idbhost1 -> indexeddb -> http://idbhost1:1/,
       // idbhost2 -> indexeddb -> http://idbhost2:2/,
       // fshost1 -> filesystem -> http://fshost1:1/,
       // fshost2 -> filesystem -> http://fshost2:1/,
       // fshost3 -> filesystem -> http://fshost3:1/,
       // quotahost1 -> quotahost1,
       // quotahost2 -> quotahost2,
       // sbc1 -> sbcerts -> sbc1,
       // sbc2 -> sbcerts -> sbc2.
       // swhost1 -> service worker -> https://swhost1:1
       // swhost2 -> service worker -> https://swhost1:2
       // xyz.com -> flash_lsos
-      EXPECT_EQ(59, cookies_model->GetRoot()->GetTotalNodeCount());
+      EXPECT_EQ(65, cookies_model->GetRoot()->GetTotalNodeCount());
       EXPECT_EQ("A,B,C", GetDisplayedCookies(cookies_model));
       EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model));
       EXPECT_EQ("http://host1:1/,http://host2:2/",
                 GetDisplayedLocalStorages(cookies_model));
       EXPECT_EQ("http://host1:1/,http://host2:2/",
                 GetDisplayedSessionStorages(cookies_model));
       EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
                 GetDisplayedIndexedDBs(cookies_model));
       EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
                 GetDisplayedFileSystems(cookies_model));
       EXPECT_EQ("quotahost1,quotahost2",
                 GetDisplayedQuotas(cookies_model));
       EXPECT_EQ("sbc1,sbc2",
                 GetDisplayedChannelIDs(cookies_model));
       EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
                 GetDisplayedServiceWorkers(cookies_model));
+      EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+                GetDisplayedCacheStorages(cookies_model));
       EXPECT_EQ("xyz.com",
                 GetDisplayedFlashLSOs(cookies_model));
     }
     return make_scoped_ptr(cookies_model);
   }
 
   // Checks that, when setting content settings for host nodes in the
   // cookie tree, the content settings are applied to the expected URL.
   void CheckContentSettingsUrlForHostNodes(
       const CookieTreeNode* node,
@@ skipping 63 matching lines @@
             ",";
       case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM:
         return node->GetDetailedInfo().file_system_info->origin.spec() +
             ",";
       case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
         return node->GetDetailedInfo().quota_info->host + ",";
       case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID:
         return node->GetDetailedInfo().channel_id->server_identifier() + ",";
       case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER:
         return node->GetDetailedInfo().service_worker_info->origin.spec() + ",";
+      case CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE:
+        return node->GetDetailedInfo().cache_storage_info->origin.spec() + ",";
       case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO:
         return node->GetDetailedInfo().flash_lso_domain + ",";
       default:
         return std::string();
     }
   }
 
   std::string GetCookiesOfChildren(const CookieTreeNode* node) {
     return GetNodesOfChildren(node, CookieTreeNode::DetailedInfo::TYPE_COOKIE);
   }
@@ skipping 26 matching lines @@
   std::string GetFileQuotaOfChildren(const CookieTreeNode* node) {
     return GetNodesOfChildren(
         node, CookieTreeNode::DetailedInfo::TYPE_QUOTA);
   }
 
   std::string GetServiceWorkersOfChildren(const CookieTreeNode* node) {
     return GetNodesOfChildren(
         node, CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER);
   }
 
+  std::string GetCacheStoragesOfChildren(const CookieTreeNode* node) {
+    return GetNodesOfChildren(node,
+                              CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE);
+  }
+
   std::string GetFlashLSOsOfChildren(const CookieTreeNode* node) {
     return GetNodesOfChildren(
         node, CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO);
   }
 
   // Get the nodes names displayed in the view (if we had one) in the order
   // they are displayed, as a comma seperated string.
   // Ex: EXPECT_STREQ("X,Y", GetDisplayedNodes(cookies_view, type).c_str());
   std::string GetDisplayedNodes(CookiesTreeModel* cookies_model,
                                 CookieTreeNode::DetailedInfo::NodeType type) {
@@ skipping 48 matching lines @@
   std::string GetDisplayedChannelIDs(CookiesTreeModel* cookies_model) {
     return GetDisplayedNodes(
         cookies_model, CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID);
   }
 
   std::string GetDisplayedServiceWorkers(CookiesTreeModel* cookies_model) {
     return GetDisplayedNodes(cookies_model,
                              CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER);
   }
 
+  std::string GetDisplayedCacheStorages(CookiesTreeModel* cookies_model) {
+    return GetDisplayedNodes(cookies_model,
+                             CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE);
+  }
+
   std::string GetDisplayedFlashLSOs(CookiesTreeModel* cookies_model) {
     return GetDisplayedNodes(
         cookies_model, CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO);
   }
 
   // Do not call on the root.
   void DeleteStoredObjects(CookieTreeNode* node) {
     node->DeleteStoredObjects();
     CookieTreeNode* parent_node = node->parent();
     DCHECK(parent_node);
@@ skipping 24 matching lines @@
   scoped_refptr<MockBrowsingDataIndexedDBHelper>
       mock_browsing_data_indexed_db_helper_;
   scoped_refptr<MockBrowsingDataFileSystemHelper>
       mock_browsing_data_file_system_helper_;
   scoped_refptr<MockBrowsingDataQuotaHelper>
       mock_browsing_data_quota_helper_;
   scoped_refptr<MockBrowsingDataChannelIDHelper>
       mock_browsing_data_channel_id_helper_;
   scoped_refptr<MockBrowsingDataServiceWorkerHelper>
       mock_browsing_data_service_worker_helper_;
+  scoped_refptr<MockBrowsingDataCacheStorageHelper>
+      mock_browsing_data_cache_storage_helper_;
   scoped_refptr<MockBrowsingDataFlashLSOHelper>
       mock_browsing_data_flash_lso_helper_;
 
 #if defined(ENABLE_EXTENSIONS)
   scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
 #endif
 };
 
 TEST_F(CookiesTreeModelTest, RemoveAll) {
   scoped_ptr<CookiesTreeModel> cookies_model(
@@ skipping 11 matching lines @@
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2",
               GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2",
               GetDisplayedChannelIDs(cookies_model.get()));
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
     EXPECT_EQ("xyz.com",
               GetDisplayedFlashLSOs(cookies_model.get()));
   }
 
   mock_browsing_data_cookie_helper_->Reset();
   mock_browsing_data_database_helper_->Reset();
   mock_browsing_data_local_storage_helper_->Reset();
   mock_browsing_data_session_storage_helper_->Reset();
   mock_browsing_data_indexed_db_helper_->Reset();
   mock_browsing_data_service_worker_helper_->Reset();
+  mock_browsing_data_cache_storage_helper_->Reset();
   mock_browsing_data_file_system_helper_->Reset();
 
   cookies_model->DeleteAllStoredObjects();
 
   // Make sure the nodes are also deleted from the model's cache.
   // http://crbug.com/43249
   cookies_model->UpdateSearchResults(base::string16());
 
   {
     // 2 nodes - root and app
     SCOPED_TRACE("After removing");
     EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
     EXPECT_EQ(0, cookies_model->GetRoot()->child_count());
     EXPECT_EQ(std::string(), GetDisplayedCookies(cookies_model.get()));
     EXPECT_TRUE(mock_browsing_data_cookie_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_database_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_local_storage_helper_->AllDeleted());
     EXPECT_FALSE(mock_browsing_data_session_storage_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_indexed_db_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_file_system_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_channel_id_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_service_worker_helper_->AllDeleted());
+    EXPECT_TRUE(mock_browsing_data_cache_storage_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_flash_lso_helper_->AllDeleted());
   }
 }
 
 TEST_F(CookiesTreeModelTest, Remove) {
   scoped_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
 
   // Children start out arranged as follows:
   //
-  // 0. `foo1`
-  // 1. `foo2`
-  // 2. `foo3`
-  // 3. `fshost1`
-  // 4. `fshost2`
-  // 5. `fshost3`
-  // 6. `gdbhost1`
-  // 7. `gdbhost2`
-  // 8. `host1`
-  // 9. `host2`
-  // 10. `idbhost1`
-  // 11. `idbhost2`
-  // 12. `quotahost1`
-  // 13. `quotahost2`
-  // 14. `sbc1`
-  // 15. `sbc2`
-  // 16. 'swhost1'
-  // 17. 'swhost2'
-  // 18. `xyz.com`
+  // 0. `cshost1`
+  // 1. `cshost2`
+  // 2. `foo1`
+  // 3. `foo2`
+  // 4. `foo3`
+  // 5. `fshost1`
+  // 6. `fshost2`
+  // 7. `fshost3`
+  // 8. `gdbhost1`
+  // 9. `gdbhost2`
+  // 10. `host1`
+  // 11. `host2`
+  // 12. `idbhost1`
+  // 13. `idbhost2`
+  // 14. `quotahost1`
+  // 15. `quotahost2`
+  // 16. `sbc1`
+  // 17. `sbc2`
+  // 18. `swhost1`
+  // 19. `swhost2`
+  // 20. `xyz.com`
   //
   // Here, we'll remove them one by one, starting from the end, and
   // check that the state makes sense.
 
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(18));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(20));
   {
     SCOPED_TRACE("`xyz.com` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2",
               GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2",
               GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(63, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(17));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(19));
   {
     SCOPED_TRACE("`swhost2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
-    EXPECT_EQ("quotahost1,quotahost2",
-              GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2",
-              GetDisplayedChannelIDs(cookies_model.get()));
+    EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/",
               GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(54, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(60, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(16));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(18));
   {
     SCOPED_TRACE("`swhost1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
-    EXPECT_EQ("quotahost1,quotahost2",
-              GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2",
-              GetDisplayedChannelIDs(cookies_model.get()));
+    EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(51, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(15));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(17));
   {
     SCOPED_TRACE("`sbc2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2",
               GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1",
               GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(48, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(54, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(14));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(16));
   {
     SCOPED_TRACE("`sbc1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2",
               GetDisplayedQuotas(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(45, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(51, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(13));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(15));
   {
     SCOPED_TRACE("`quotahost2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("quotahost1",
               GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(43, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(49, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(12));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(14));
   {
     SCOPED_TRACE("`quotahost1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(47, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(11));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(13));
   {
     SCOPED_TRACE("`idbhost2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(38, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(44, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(12));
   {
     SCOPED_TRACE("`idbhost1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(35, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(9));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(11));
   {
     SCOPED_TRACE("`host2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(30, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(36, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10));
   {
     SCOPED_TRACE("`host1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(25, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(31, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(7));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(9));
   {
     SCOPED_TRACE("`gdbhost2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(22, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(28, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8));
   {
     SCOPED_TRACE("`gdbhost1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(19, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(25, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(5));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(7));
   {
     SCOPED_TRACE("`fshost3` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(16, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(22, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(4));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6));
   {
     SCOPED_TRACE("`fshost2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(13, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(19, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(5));
   {
     SCOPED_TRACE("`fshost1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(10, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(16, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(4));
   {
     SCOPED_TRACE("`foo3` removed.");
     EXPECT_STREQ("A,B", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(7, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(13, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3));
   {
     SCOPED_TRACE("`foo2` removed.");
     EXPECT_STREQ("A", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(4, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(10, cookies_model->GetRoot()->GetTotalNodeCount());
   }
-  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2));
   {
     SCOPED_TRACE("`foo1` removed.");
     EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(7, cookies_model->GetRoot()->GetTotalNodeCount());
+  }
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1));
+  {
+    SCOPED_TRACE("`cshost2` removed.");
+    EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
+    EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
+    EXPECT_EQ("https://cshost1:1/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+    EXPECT_EQ(4, cookies_model->GetRoot()->GetTotalNodeCount());
+  }
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0));
+  {
+    SCOPED_TRACE("`cshost1` removed.");
+    EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
+    EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
     EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 }
 
 TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
   scoped_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
 
-  DeleteStoredObjects(
-      cookies_model->GetRoot()->GetChild(0)->GetChild(0));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2)->GetChild(0));
   {
-    SCOPED_TRACE("First origin removed");
+    SCOPED_TRACE("First cookies origin removed");
     EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
-    // 57 because in this case, the origin remains, although the COOKIES
+    // 63 because in this case, the origin remains, although the COOKIES
     // node beneath it has been deleted.
-    EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ(63, cookies_model->GetRoot()->GetTotalNodeCount());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
   }
 
-  DeleteStoredObjects(
-      cookies_model->GetRoot()->GetChild(6)->GetChild(0));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
   {
-    SCOPED_TRACE("First database removed");
+    SCOPED_TRACE("First database origin removed");
     EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(55, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ(61, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 
-  DeleteStoredObjects(
-      cookies_model->GetRoot()->GetChild(8)->GetChild(0));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10)->GetChild(0));
   {
-    SCOPED_TRACE("First origin removed");
+    SCOPED_TRACE("First local storage origin removed");
     EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(53, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ(59, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 }
 
 TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
   scoped_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
 
-  DeleteStoredObjects(
-      cookies_model->GetRoot()->GetChild(1)->GetChild(0));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3)->GetChild(0));
   {
     SCOPED_TRACE("Second origin COOKIES node removed");
     EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
-    // 57 because in this case, the origin remains, although the COOKIES
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    // 63 because in this case, the origin remains, although the COOKIES
     // node beneath it has been deleted.
-    EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ(63, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 
-  DeleteStoredObjects(
-      cookies_model->GetRoot()->GetChild(6)->GetChild(0));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
   {
-    SCOPED_TRACE("First database removed");
+    SCOPED_TRACE("First database origin removed");
     EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(55, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ(61, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 
-  DeleteStoredObjects(
-      cookies_model->GetRoot()->GetChild(8)->GetChild(0));
+  DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10)->GetChild(0));
   {
-    SCOPED_TRACE("First origin removed");
+    SCOPED_TRACE("First local storage origin removed");
     EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(cookies_model.get()));
-    EXPECT_EQ(53, cookies_model->GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(cookies_model.get()));
+    EXPECT_EQ(59, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 }
 
 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
                              mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_service_worker_helper_.get(),
+                             mock_browsing_data_cache_storage_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "C=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "D=1");
   mock_browsing_data_cookie_helper_->Notify();
   mock_browsing_data_database_helper_->AddDatabaseSamples();
   mock_browsing_data_database_helper_->Notify();
   mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
   mock_browsing_data_local_storage_helper_->Notify();
   mock_browsing_data_session_storage_helper_->AddLocalStorageSamples();
   mock_browsing_data_session_storage_helper_->Notify();
   mock_browsing_data_indexed_db_helper_->AddIndexedDBSamples();
   mock_browsing_data_indexed_db_helper_->Notify();
   mock_browsing_data_file_system_helper_->AddFileSystemSamples();
   mock_browsing_data_file_system_helper_->Notify();
   mock_browsing_data_quota_helper_->AddQuotaSamples();
   mock_browsing_data_quota_helper_->Notify();
   mock_browsing_data_service_worker_helper_->AddServiceWorkerSamples();
   mock_browsing_data_service_worker_helper_->Notify();
+  mock_browsing_data_cache_storage_helper_->AddCacheStorageSamples();
+  mock_browsing_data_cache_storage_helper_->Notify();
 
   {
-    SCOPED_TRACE("Initial State 4 cookies, 2 databases, 2 local storages, "
-                 "2 session storages, 2 indexed DBs, 3 file systems, "
-                 "2 quotas, 2 service workers.");
-    // 52 because there's the root, then
+    SCOPED_TRACE(
+        "Initial State 4 cookies, 2 databases, 2 local storages, "
+        "2 session storages, 2 indexed DBs, 3 file systems, "
+        "2 quotas, 2 service workers, 2 caches.");
+    // 58 because there's the root, then
+    // cshost1 -> cache storage -> https://cshost1:1/
+    // cshost2 -> cache storage -> https://cshost2:2/
     // foo1 -> cookies -> a,
     // foo2 -> cookies -> b,
     // foo3 -> cookies -> c,d
     // dbhost1 -> database -> db1,
     // dbhost2 -> database -> db2,
     // host1 -> localstorage -> http://host1:1/,
     //       -> sessionstorage -> http://host1:1/,
     // host2 -> localstorage -> http://host2:2/,
     //       -> sessionstorage -> http://host2:2/,
     // idbhost1 -> sessionstorage -> http://idbhost1:1/,
     // idbhost2 -> sessionstorage -> http://idbhost2:2/,
     // fshost1 -> filesystem -> http://fshost1:1/,
     // fshost2 -> filesystem -> http://fshost2:1/,
     // fshost3 -> filesystem -> http://fshost3:1/,
     // quotahost1 -> quotahost1,
     // quotahost2 -> quotahost2.
     // swhost1 -> service worker -> https://swhost1:1
     // swhost2 -> service worker -> https://swhost1:2
-    EXPECT_EQ(52, cookies_model.GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ(58, cookies_model.GetRoot()->GetTotalNodeCount());
     EXPECT_STREQ("A,B,C,D", GetDisplayedCookies(&cookies_model).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(&cookies_model));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(&cookies_model));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(&cookies_model));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(&cookies_model));
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(&cookies_model));
   }
-  DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2));
+  DeleteStoredObjects(cookies_model.GetRoot()->GetChild(4));
   {
-    SCOPED_TRACE("Third origin removed");
+    SCOPED_TRACE("Third cookie origin removed");
     EXPECT_STREQ("A,B", GetDisplayedCookies(&cookies_model).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(&cookies_model));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(&cookies_model));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(&cookies_model));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(&cookies_model));
-    EXPECT_EQ(48, cookies_model.GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(&cookies_model));
+    EXPECT_EQ(54, cookies_model.GetRoot()->GetTotalNodeCount());
   }
 }
 
 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
                              mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_service_worker_helper_.get(),
+                             mock_browsing_data_cache_storage_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "C=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "D=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "E=1");
   mock_browsing_data_cookie_helper_->Notify();
   mock_browsing_data_database_helper_->AddDatabaseSamples();
   mock_browsing_data_database_helper_->Notify();
   mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
   mock_browsing_data_local_storage_helper_->Notify();
   mock_browsing_data_session_storage_helper_->AddLocalStorageSamples();
   mock_browsing_data_session_storage_helper_->Notify();
   mock_browsing_data_indexed_db_helper_->AddIndexedDBSamples();
   mock_browsing_data_indexed_db_helper_->Notify();
   mock_browsing_data_file_system_helper_->AddFileSystemSamples();
   mock_browsing_data_file_system_helper_->Notify();
   mock_browsing_data_quota_helper_->AddQuotaSamples();
   mock_browsing_data_quota_helper_->Notify();
   mock_browsing_data_service_worker_helper_->AddServiceWorkerSamples();
   mock_browsing_data_service_worker_helper_->Notify();
+  mock_browsing_data_cache_storage_helper_->AddCacheStorageSamples();
+  mock_browsing_data_cache_storage_helper_->Notify();
 
   {
-    SCOPED_TRACE("Initial State 5 cookies, 2 databases, 2 local storages, "
-                 "2 session storages, 2 indexed DBs, 3 filesystems, "
-                 "2 quotas, 2 service workers.");
-    // 53 because there's the root, then
+    SCOPED_TRACE(
+        "Initial State 5 cookies, 2 databases, 2 local storages, "
+        "2 session storages, 2 indexed DBs, 3 filesystems, "
+        "2 quotas, 2 service workers, 2 caches.");
+    // 59 because there's the root, then
+    // cshost1 -> cache storage -> https://cshost1:1/
+    // cshost2 -> cache storage -> https://cshost2:2/
     // foo1 -> cookies -> a,
     // foo2 -> cookies -> b,
     // foo3 -> cookies -> c,d,e
     // dbhost1 -> database -> db1,
     // dbhost2 -> database -> db2,
     // host1 -> localstorage -> http://host1:1/,
     //       -> sessionstorage -> http://host1:1/,
     // host2 -> localstorage -> http://host2:2/,
     //       -> sessionstorage -> http://host2:2/,
     // idbhost1 -> sessionstorage -> http://idbhost1:1/,
     // idbhost2 -> sessionstorage -> http://idbhost2:2/,
     // fshost1 -> filesystem -> http://fshost1:1/,
     // fshost2 -> filesystem -> http://fshost2:1/,
     // fshost3 -> filesystem -> http://fshost3:1/,
     // quotahost1 -> quotahost1,
     // quotahost2 -> quotahost2.
     // swhost1 -> service worker -> https://swhost1:1
     // swhost2 -> service worker -> https://swhost1:2
-    EXPECT_EQ(53, cookies_model.GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ(59, cookies_model.GetRoot()->GetTotalNodeCount());
     EXPECT_STREQ("A,B,C,D,E", GetDisplayedCookies(&cookies_model).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(&cookies_model));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(&cookies_model));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(&cookies_model));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(&cookies_model));
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(&cookies_model));
   }
-  DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2)->GetChild(0)->
-      GetChild(1));
+  DeleteStoredObjects(
+      cookies_model.GetRoot()->GetChild(4)->GetChild(0)->GetChild(1));
   {
-    SCOPED_TRACE("Middle cookie in third origin removed");
+    SCOPED_TRACE("Middle cookie in third cookie origin removed");
     EXPECT_STREQ("A,B,C,E", GetDisplayedCookies(&cookies_model).c_str());
-    EXPECT_EQ(52, cookies_model.GetRoot()->GetTotalNodeCount());
+    EXPECT_EQ(58, cookies_model.GetRoot()->GetTotalNodeCount());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(&cookies_model));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(&cookies_model));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(&cookies_model));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(&cookies_model));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
     EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
               GetDisplayedServiceWorkers(&cookies_model));
+    EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+              GetDisplayedCacheStorages(&cookies_model));
   }
 }
 
 TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
                              mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_service_worker_helper_.get(),
+                             mock_browsing_data_cache_storage_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "C=1");
   mock_browsing_data_cookie_helper_->
@@ skipping 23 matching lines @@
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
                              mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_service_worker_helper_.get(),
+                             mock_browsing_data_cache_storage_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://a.foo2.com"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2.com"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://b.foo1.com"), "C=1");
   // Leading dot on the foo4
@@ skipping 28 matching lines @@
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
                              mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_service_worker_helper_.get(),
+                             mock_browsing_data_cache_storage_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy(), false);
 
   mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
   mock_browsing_data_cookie_helper_->Notify();
 
   TestingProfile profile;
   HostContentSettingsMap* content_settings =
       profile.GetHostContentSettingsMap();
   content_settings::CookieSettings* cookie_settings =
@@ skipping 62 matching lines @@
             GetDisplayedServiceWorkers(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(base::ASCIIToUTF16("swhost3"));
   EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(base::string16());
   EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
             GetDisplayedServiceWorkers(cookies_model.get()));
 }
 
+TEST_F(CookiesTreeModelTest, CacheStorageFilter) {
+  scoped_ptr<CookiesTreeModel> cookies_model(
+      CreateCookiesTreeModelWithInitialSample());
+
+  cookies_model->UpdateSearchResults(base::ASCIIToUTF16("cshost1"));
+  EXPECT_EQ("https://cshost1:1/",
+            GetDisplayedCacheStorages(cookies_model.get()));
+
+  cookies_model->UpdateSearchResults(base::ASCIIToUTF16("cshost2"));
+  EXPECT_EQ("https://cshost2:2/",
+            GetDisplayedCacheStorages(cookies_model.get()));
+
+  cookies_model->UpdateSearchResults(base::ASCIIToUTF16("cshost3"));
+  EXPECT_EQ("", GetDisplayedCacheStorages(cookies_model.get()));
+
+  cookies_model->UpdateSearchResults(base::string16());
+  EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+            GetDisplayedCacheStorages(cookies_model.get()));
+}
+
 TEST_F(CookiesTreeModelTest, CookiesFilter) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
                              mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_service_worker_helper_.get(),
+                             mock_browsing_data_cache_storage_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://123.com"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1.com"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2.com"), "C=1");
   mock_browsing_data_cookie_helper_->
@@ skipping 21 matching lines @@
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
                              mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_service_worker_helper_.get(),
+                             mock_browsing_data_cache_storage_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(container, special_storage_policy(),
                                  true /* group by cookie source */);
 
   mock_browsing_data_cookie_helper_->AddCookieSamples(
       GURL("file:///tmp/test.html"), "A=1");
   mock_browsing_data_cookie_helper_->AddCookieSamples(
       GURL("http://example.com"), "B=1");
   mock_browsing_data_cookie_helper_->AddCookieSamples(
       GURL("http://example.com/"), "C=1");
@@ skipping 55 matching lines @@
 
   cookies_model.UpdateSearchResults(
       base::string16(base::ASCIIToUTF16("example4.com")));
   EXPECT_EQ("L", GetDisplayedCookies(&cookies_model));
   CheckContentSettingsUrlForHostNodes(
       cookies_model.GetRoot(), CookieTreeNode::DetailedInfo::TYPE_ROOT,
       cookie_settings, GURL("http://example4.com"));
 }
 
 }  // namespace