Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

The counter was separated from the container in
https://codereview.chromium.org/588583002, in preparation for componentisation
which never happened. As jam@ points out in
https://codereview.chromium.org/2375333003/#msg9, it should be cleaned-up.

This is in effect a revert of https://codereview.chromium.org/588583002 and https://codereview.chromium.org/640733002, only done manually, because the code has changed since those CLs landed.

BUG=384873
Committed: https://crrev.com/bab3ffcb0b05194d5ca972938324422220d4225b
Cr-Commit-Position: refs/heads/master@{#422740}

[vabr (Chromium), 2016-09-30 15:54:29]

The CQ bit was checked by vabr@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-30 15:54:42]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[vabr (Chromium), 2016-09-30 15:55:49]

Description was changed from

==========
Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

The counter was separated from the container in
https://codereview.chromium.org/588583002, in preparation for componentisation
which never happened. As jam@ points out in
https://codereview.chromium.org/2375333003/#msg9, it should be cleaned-up.

BUG=384873
==========

to

==========
Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

The counter was separated from the container in
https://codereview.chromium.org/588583002, in preparation for componentisation
which never happened. As jam@ points out in
https://codereview.chromium.org/2375333003/#msg9, it should be cleaned-up.

This is in effect a revert of https://codereview.chromium.org/588583002 and
https://codereview.chromium.org/640733002, only done manually, because the code
has changed since those CLs landed.

BUG=384873
==========

[commit-bot: I haz the power, 2016-09-30 16:10:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-30 16:10:18]

Dry run: Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_chromeos_compile_dbg_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[vabr (Chromium), 2016-09-30 16:25:32]

The CQ bit was checked by vabr@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-30 16:25:52]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-30 16:40:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-30 16:40:23]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_compile_dbg_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[vabr (Chromium), 2016-09-30 16:50:43]

The CQ bit was checked by vabr@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-30 16:51:05]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[vabr (Chromium), 2016-09-30 17:50:34]

vabr@chromium.org changed reviewers:
+ jam@chromium.org, msramek@chromium.org

[vabr (Chromium), 2016-09-30 17:50:35]

Hi jam@ and msramek@.

msramek@: Please review chrome/browser/content_settings/* and
components/content_settings/*

jam@: Please review the rest.

Thanks!
Vaclav

[commit-bot: I haz the power, 2016-09-30 18:24:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-30 18:24:15]

Dry run: This issue passed the CQ dry run.

[jam, 2016-10-01 00:09:00]

lgtm, thanks

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

LGTM

https://codereview.chromium.org/2380943004/diff/40001/chrome/browser/content_...
File chrome/browser/content_settings/local_shared_objects_container.h (right):

https://codereview.chromium.org/2380943004/diff/40001/chrome/browser/content_...
chrome/browser/content_settings/local_shared_objects_container.h:37: size_t
GetObjectCountForDomain(const GURL& url) const;
Please rename |url| to |origin| to match the comment and the implementation.

[vabr (Chromium), 2016-10-04 08:52:11]

The CQ bit was checked by vabr@chromium.org

[vabr (Chromium), 2016-10-04 08:52:17]

The CQ bit was unchecked by vabr@chromium.org

[vabr (Chromium), 2016-10-04 08:56:14]

The CQ bit was checked by vabr@chromium.org

[vabr (Chromium), 2016-10-04 08:56:15]

The patchset sent to the CQ was uploaded after l-g-t-m from
msramek@chromium.org, jam@chromium.org
Link to the patchset: https://codereview.chromium.org/2380943004/#ps60001
(title: "url -> origin")

[commit-bot: I haz the power, 2016-10-04 08:56:35]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[vabr (Chromium), 2016-10-04 08:57:45]

Thanks for reviews!

https://codereview.chromium.org/2380943004/diff/40001/chrome/browser/content_...
File chrome/browser/content_settings/local_shared_objects_container.h (right):

https://codereview.chromium.org/2380943004/diff/40001/chrome/browser/content_...
chrome/browser/content_settings/local_shared_objects_container.h:37: size_t
GetObjectCountForDomain(const GURL& url) const;
On 2016/10/04 08:43:05, msramek wrote:
> Please rename |url| to |origin| to match the comment and the implementation.

Done.

[commit-bot: I haz the power, 2016-10-04 10:08:27]

Description was changed from

==========
Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

The counter was separated from the container in
https://codereview.chromium.org/588583002, in preparation for componentisation
which never happened. As jam@ points out in
https://codereview.chromium.org/2375333003/#msg9, it should be cleaned-up.

This is in effect a revert of https://codereview.chromium.org/588583002 and
https://codereview.chromium.org/640733002, only done manually, because the code
has changed since those CLs landed.

BUG=384873
==========

to

==========
Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

The counter was separated from the container in
https://codereview.chromium.org/588583002, in preparation for componentisation
which never happened. As jam@ points out in
https://codereview.chromium.org/2375333003/#msg9, it should be cleaned-up.

This is in effect a revert of https://codereview.chromium.org/588583002 and
https://codereview.chromium.org/640733002, only done manually, because the code
has changed since those CLs landed.

BUG=384873
==========

[commit-bot: I haz the power, 2016-10-04 10:08:32]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-10-04 10:12:06]

Description was changed from

==========
Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

The counter was separated from the container in
https://codereview.chromium.org/588583002, in preparation for componentisation
which never happened. As jam@ points out in
https://codereview.chromium.org/2375333003/#msg9, it should be cleaned-up.

This is in effect a revert of https://codereview.chromium.org/588583002 and
https://codereview.chromium.org/640733002, only done manually, because the code
has changed since those CLs landed.

BUG=384873
==========

to

==========
Merge LocalSharedObjectsContainer with LocalSharedObjectsCounter

The counter was separated from the container in
https://codereview.chromium.org/588583002, in preparation for componentisation
which never happened. As jam@ points out in
https://codereview.chromium.org/2375333003/#msg9, it should be cleaned-up.

This is in effect a revert of https://codereview.chromium.org/588583002 and
https://codereview.chromium.org/640733002, only done manually, because the code
has changed since those CLs landed.

BUG=384873

Committed: https://crrev.com/bab3ffcb0b05194d5ca972938324422220d4225b
Cr-Commit-Position: refs/heads/master@{#422740}
==========

[commit-bot: I haz the power, 2016-10-04 10:12:07]

Patchset 4 (id:??) landed as
https://crrev.com/bab3ffcb0b05194d5ca972938324422220d4225b
Cr-Commit-Position: refs/heads/master@{#422740}