Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

chrome/browser/content_settings/tab_specific_content_settings.h

Index: chrome/browser/content_settings/tab_specific_content_settings.h
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index 9c07aa00ea61eebddf304e54eb54e09aad54671a..0835405fc69d5c214577c38b410a3004d698cefc 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -16,7 +16,6 @@
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "build/build_config.h"
-#include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
@@ -295,27 +294,17 @@ class TabSpecificContentSettings
     return pending_protocol_handler_setting_;
   }
 
-  // Returns the |LocalSharedObjectsCounter| instances corresponding to all
+  // Returns the |LocalSharedObjectsContainer| instances corresponding to all
   // allowed, and blocked, respectively, local shared objects like cookies,
   // local storage, ... .
-  const LocalSharedObjectsCounter& allowed_local_shared_objects() const {
+  const LocalSharedObjectsContainer& allowed_local_shared_objects() const {
     return allowed_local_shared_objects_;
   }
 
-  const LocalSharedObjectsCounter& blocked_local_shared_objects() const {
+  const LocalSharedObjectsContainer& blocked_local_shared_objects() const {
     return blocked_local_shared_objects_;
   }
 
-  // Creates a new copy of a CookiesTreeModel for all allowed, and blocked,
-  // respectively, local shared objects.
-  std::unique_ptr<CookiesTreeModel> CreateAllowedCookiesTreeModel() const {
-    return allowed_local_shared_objects_.CreateCookiesTreeModel();
-  }
-
-  std::unique_ptr<CookiesTreeModel> CreateBlockedCookiesTreeModel() const {
-    return blocked_local_shared_objects_.CreateCookiesTreeModel();
-  }
-
   bool load_plugins_link_enabled() { return load_plugins_link_enabled_; }
   void set_load_plugins_link_enabled(bool enabled) {
     load_plugins_link_enabled_ = enabled;