Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

chrome/browser/content_settings/local_shared_objects_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_LOCAL_SHARED_OBJECTS_CONTAINER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_LOCAL_SHARED_OBJECTS_CONTAINER_H_
 
 #include <stddef.h>
 
 #include <memory>
 
 #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;
 class CannedBrowsingDataCookieHelper;
 class CannedBrowsingDataDatabaseHelper;
 class CannedBrowsingDataFileSystemHelper;
 class CannedBrowsingDataIndexedDBHelper;
 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();
 
   // Creates a new CookiesTreeModel for all objects in the container,
   // copying each of them.
   std::unique_ptr<CookiesTreeModel> CreateCookiesTreeModel() const;
 
   CannedBrowsingDataAppCacheHelper* appcaches() const {
     return appcaches_.get();
@@ skipping 33 matching lines @@
   scoped_refptr<CannedBrowsingDataIndexedDBHelper> indexed_dbs_;
   scoped_refptr<CannedBrowsingDataLocalStorageHelper> local_storages_;
   scoped_refptr<CannedBrowsingDataServiceWorkerHelper> service_workers_;
   scoped_refptr<CannedBrowsingDataCacheStorageHelper> cache_storages_;
   scoped_refptr<CannedBrowsingDataLocalStorageHelper> session_storages_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalSharedObjectsContainer);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_LOCAL_SHARED_OBJECTS_CONTAINER_H_