Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

chrome/browser/content_settings/local_shared_objects_container.h

Index: chrome/browser/content_settings/local_shared_objects_container.h
diff --git a/chrome/browser/content_settings/local_shared_objects_container.h b/chrome/browser/content_settings/local_shared_objects_container.h
index e9928c190e8a17979f475a178574f7269d6403a6..8992adc0cb5b5bcc0cdb544bf50a2809496efadc 100644
--- a/chrome/browser/content_settings/local_shared_objects_container.h
+++ b/chrome/browser/content_settings/local_shared_objects_container.h
@@ -11,7 +11,6 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "components/content_settings/core/browser/local_shared_objects_counter.h"
 
 class CannedBrowsingDataAppCacheHelper;
 class CannedBrowsingDataChannelIDHelper;
@@ -23,16 +22,19 @@ class CannedBrowsingDataLocalStorageHelper;
 class CannedBrowsingDataServiceWorkerHelper;
 class CannedBrowsingDataCacheStorageHelper;
 class CookiesTreeModel;
+class GURL;
 class Profile;
 
-class LocalSharedObjectsContainer : public LocalSharedObjectsCounter {
+class LocalSharedObjectsContainer {
  public:
   explicit LocalSharedObjectsContainer(Profile* profile);
-  ~LocalSharedObjectsContainer() override;
+  ~LocalSharedObjectsContainer();
 
-  // LocalSharedObjectsCounter:
-  size_t GetObjectCount() const override;
-  size_t GetObjectCountForDomain(const GURL& url) const override;
+  // Returns the number of objects stored in the container.
+  size_t GetObjectCount() const;
+
+  // Returns the number of objects for the given |origin|.
+  size_t GetObjectCountForDomain(const GURL& url) const;

[msramek, 2016/10/04 08:43:05]

Please rename |url| to |origin| to match the comment and the implementation.

[vabr (Chromium), 2016/10/04 08:57:44]

Done.

 
   // Empties the container.
   void Reset();