Removed Profile::GetHostContentSettingsMap

Removed Profile::GetHostContentSettingsMap

Parts:
1) Removed Profile::GetHostContentSettingsMap.
2) Replaced its use with HostContentSettingsMapFactory::GetForProfile.
3) Added dependencies for factories that depend on HCSM.
3.1) Extracted common dependencies for factories of PermissionContextBase subclasses.
4) Removed unnecessary notification watcher from SupervisedProvider (it is owned by HCSM so will be shutdown at the correct time).

BUG=112530
TBR=sky@chromium.org

Committed: https://crrev.com/5100d43a99c1c6657162db57cc3dde53a5b55277
Cr-Commit-Position: refs/heads/master@{#349099}

[PEConn, 2015-09-09 13:55:02]

peconn@chromium.org changed reviewers:
+ bauerb@chromium.org

[PEConn, 2015-09-09 14:21:11]

Patchset #1 (id:1) has been deleted

[PEConn, 2015-09-09 15:08:39]

Patchset #1 (id:20001) has been deleted

[PEConn, 2015-09-09 15:53:15]

Patchset #2 (id:60001) has been deleted

[PEConn, 2015-09-09 16:49:51]

peconn@chromium.org changed reviewers:
+ erg@chromium.org

[PEConn, 2015-09-09 16:50:21]

Patchset #1 (id:40001) has been deleted

[PEConn, 2015-09-09 16:50:33]

Patchset #1 (id:60001) has been deleted

[PEConn, 2015-09-09 16:51:26]

Removed Profile::GetHostContentSettingsMap

Replaced its use with HostContentSettingsMapFactory::GetForProfile.

[Elliot Glaysher, 2015-09-09 17:24:23]

<3 cleanup patches

lgtm

[Peter Beverloo, 2015-09-09 21:03:50]

peter@chromium.org changed reviewers:
+ peter@chromium.org

[Peter Beverloo, 2015-09-09 21:03:51]

https://codereview.chromium.org/1312453005/diff/80001/chrome/browser/push_mes...
File chrome/browser/push_messaging/push_messaging_service_impl.cc (right):

https://codereview.chromium.org/1312453005/diff/80001/chrome/browser/push_mes...
chrome/browser/push_messaging/push_messaging_service_impl.cc:748:
HostContentSettingsMapFactory::GetForProfile(profile_)->RemoveObserver(this);
Shouldn't the PushMessagingServiceFactory declare a dependency on the
HostContentSettingsMapFactory after this change? (Which also goes for many of
the other uses...)

[Bernhard Bauer, 2015-09-10 09:30:44]

https://codereview.chromium.org/1312453005/diff/80001/chrome/browser/push_mes...
File chrome/browser/push_messaging/push_messaging_service_impl.cc (right):

https://codereview.chromium.org/1312453005/diff/80001/chrome/browser/push_mes...
chrome/browser/push_messaging/push_messaging_service_impl.cc:748:
HostContentSettingsMapFactory::GetForProfile(profile_)->RemoveObserver(this);
On 2015/09/09 21:03:51, Peter Beverloo wrote:
> Shouldn't the PushMessagingServiceFactory declare a dependency on the
> HostContentSettingsMapFactory after this change? (Which also goes for many of
> the other uses...)

Yes, that would be good.

[PEConn, 2015-09-10 14:33:06]

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

[commit-bot: I haz the power, 2015-09-10 14:33:17]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/100001

[commit-bot: I haz the power, 2015-09-10 15:37:31]

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

[commit-bot: I haz the power, 2015-09-10 15:37:32]

Dry run: This issue passed the CQ dry run.

[PEConn, 2015-09-11 11:33:16]

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

[commit-bot: I haz the power, 2015-09-11 11:33:28]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/120001

[PEConn, 2015-09-11 12:56:56]

peconn@chromium.org changed reviewers:
+ benwells@chromium.org, dalecurtis@chromium.org, dewittj@chromium.org,
dgrogan@chromium.org, mvanouwerkerk@chromium.org

[PEConn, 2015-09-11 12:57:26]

Could you please review:
(The number in brackets corresponds to what part of the CL the file changes are
relevant to)

@bauerb:
chrome/browser/content_settings/cookie_settings_factory.* (3)
chrome/browser/content_settings/content_settings_supervised_provider.* (4)

@erg
chrome/browser/profiles/profile.* (1)
chrome/browser/profiles/profile_impl.* (1)
chrome/browser/profiles/off_the_record_profile_impl.* (1)

@benwells
chrome/browser/engagement/site_engagement_service_factory.* (3)
chrome/browser/permissions/permission_manager_factory.* (3)
chrome/browser/permissions/permission_context_factory_base.* (3.1)

@mvanouwerkerk
chrome/browser/geolocation/geolocation_permission_context_factory.* (3.1)

@dalecurtis
chrome/browser/media/media_stream_camera_permission_context_factory.* (3.1)
chrome/browser/media/media_stream_mic_permission_context_factory.* (3.1)
chrome/browser/media/midi_permission_context_factory.* (3.1)
chrome/browser/media/protected_media_identifier_permission_context_factory.*
(3.1)

@dewittj
chrome/browser/notifications/notification_permission_context_factory.* (3.1)

@peter
chrome/browser/push_messaging/push_messaging_permission_context_factory.* (3.1)

@dgrogan
chrome/browser/storage/durable_storage_permission_context_factory.* (3.1)

Then all the call sites (point 2) will be TBR=sky.

https://codereview.chromium.org/1312453005/diff/80001/chrome/browser/push_mes...
File chrome/browser/push_messaging/push_messaging_service_impl.cc (right):

https://codereview.chromium.org/1312453005/diff/80001/chrome/browser/push_mes...
chrome/browser/push_messaging/push_messaging_service_impl.cc:748:
HostContentSettingsMapFactory::GetForProfile(profile_)->RemoveObserver(this);
On 2015/09/10 09:30:44, Bernhard Bauer wrote:
> On 2015/09/09 21:03:51, Peter Beverloo wrote:
> > Shouldn't the PushMessagingServiceFactory declare a dependency on the
> > HostContentSettingsMapFactory after this change? (Which also goes for many
of
> > the other uses...)
> 
> Yes, that would be good.

PushMessagingServiceFactory already declares a dependency (it was in the earlier
changelist). However I went through and found some other Factories that needed
dependencies declared.

[Michael van Ouwerkerk, 2015-09-11 13:05:33]

geolocation lgtm

[Bernhard Bauer, 2015-09-11 13:15:19]

content_settings/ LGTM, thanks!

[Peter Beverloo, 2015-09-11 13:29:28]

push and notifications lgtm % comments, thank you! :)

[Peter Beverloo, 2015-09-11 13:29:38]

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/notific...
File chrome/browser/notifications/notification_permission_context_factory.h
(right):

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/notific...
chrome/browser/notifications/notification_permission_context_factory.h:29:
content::BrowserContext* GetBrowserContextToUse(
This method is now identical to
PermissionContextFactoryBase::GetBrowserContextToUse(), we don't have to
override it again :)

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
File chrome/browser/permissions/permission_context_factory_base.h (right):

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
chrome/browser/permissions/permission_context_factory_base.h:5: #ifndef
PERMISSION_CONTEXT_FACTORY_BASE_H_
nit: please use the full path when writing the header guards, e.g.

CHROME_BROWSER_PERMISSIONS_PERMISSION_CONTEXT_FACTORY_BASE_H_

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
chrome/browser/permissions/permission_context_factory_base.h:13: class
BrowserContext;
nit: we don't indent code in namespaces.

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
chrome/browser/permissions/permission_context_factory_base.h:30: #endif //
PERMISSION_CONTEXT_FACTORY_BASE_H_
nit: two spaces before the //

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/push_me...
File chrome/browser/push_messaging/push_messaging_permission_context_factory.h
(right):

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/push_me...
chrome/browser/push_messaging/push_messaging_permission_context_factory.h:30:
content::BrowserContext* GetBrowserContextToUse(
dito regarding dropping this method from this class.

[commit-bot: I haz the power, 2015-09-11 13:33:11]

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

[commit-bot: I haz the power, 2015-09-11 13:33:12]

Dry run: This issue passed the CQ dry run.

[PEConn, 2015-09-11 15:19:16]

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

[commit-bot: I haz the power, 2015-09-11 15:19:27]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/140001

[DaleCurtis, 2015-09-11 16:30:30]

media/ lgtm

[commit-bot: I haz the power, 2015-09-11 16:50:29]

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

[commit-bot: I haz the power, 2015-09-11 16:50:30]

Dry run: This issue passed the CQ dry run.

[Elliot Glaysher, 2015-09-11 17:24:59]

profiles lgtm

[dgrogan, 2015-09-11 19:34:40]

chrome/browser/storage/durable_storage_permission_context_factory.* LGTM

[benwells, 2015-09-14 03:50:05]

c/b/apps
c/b/site_engagement
c/b/extensions
c/b/ui/app_list all lgtm

i am not an owner for permissions which you asked me to review.

https://codereview.chromium.org/1312453005/diff/140001/chrome/browser/engagem...
File chrome/browser/engagement/site_engagement_service.cc (right):

https://codereview.chromium.org/1312453005/diff/140001/chrome/browser/engagem...
chrome/browser/engagement/site_engagement_service.cc:16: #include
"chrome/browser/profiles/profile.h"
Nit: I think you should be able to remove this include now (and maybe in other
files), which would be nice.

[PEConn, 2015-09-14 09:06:32]

peconn@chromium.org changed reviewers:
+ miguelg@chromium.org

[PEConn, 2015-09-14 09:07:34]

@miguelg

Could you please review:
chrome/browser/permissions/permission_manager_factory.*
chrome/browser/permissions/permission_context_factory_base.*
With regards to points 3 and 3.1 in the description.

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/notific...
File chrome/browser/notifications/notification_permission_context_factory.h
(right):

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/notific...
chrome/browser/notifications/notification_permission_context_factory.h:29:
content::BrowserContext* GetBrowserContextToUse(
On 2015/09/11 13:29:38, Peter Beverloo wrote:
> This method is now identical to
> PermissionContextFactoryBase::GetBrowserContextToUse(), we don't have to
> override it again :)

Done.

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
File chrome/browser/permissions/permission_context_factory_base.h (right):

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
chrome/browser/permissions/permission_context_factory_base.h:5: #ifndef
PERMISSION_CONTEXT_FACTORY_BASE_H_
On 2015/09/11 13:29:38, Peter Beverloo wrote:
> nit: please use the full path when writing the header guards, e.g.
> 
> CHROME_BROWSER_PERMISSIONS_PERMISSION_CONTEXT_FACTORY_BASE_H_

Done.

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
chrome/browser/permissions/permission_context_factory_base.h:13: class
BrowserContext;
On 2015/09/11 13:29:38, Peter Beverloo wrote:
> nit: we don't indent code in namespaces.

Done.

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/permiss...
chrome/browser/permissions/permission_context_factory_base.h:30: #endif //
PERMISSION_CONTEXT_FACTORY_BASE_H_
On 2015/09/11 13:29:38, Peter Beverloo wrote:
> nit: two spaces before the //

Done.

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/push_me...
File chrome/browser/push_messaging/push_messaging_permission_context_factory.h
(right):

https://codereview.chromium.org/1312453005/diff/120001/chrome/browser/push_me...
chrome/browser/push_messaging/push_messaging_permission_context_factory.h:30:
content::BrowserContext* GetBrowserContextToUse(
On 2015/09/11 13:29:38, Peter Beverloo wrote:
> dito regarding dropping this method from this class.

Done.

[Miguel Garcia, 2015-09-14 09:22:54]

miguelg@chromium.org changed reviewers:
+ mlamouri@chromium.org

[Miguel Garcia, 2015-09-14 09:22:55]

Adding Mounir to review those files. /me moves to CC

[mlamouri (slow - plz ping), 2015-09-15 11:28:37]

chrome/browser/permissions/ lgtm

[PEConn, 2015-09-15 13:10:39]

The CQ bit was checked by peconn@chromium.org

[PEConn, 2015-09-15 13:10:40]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org,
peter@chromium.org, mvanouwerkerk@chromium.org, benwells@chromium.org,
erg@chromium.org, dgrogan@chromium.org, dalecurtis@chromium.org
Link to the patchset: https://codereview.chromium.org/1312453005/#ps160001
(title: "Removed include")

[commit-bot: I haz the power, 2015-09-15 13:10:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/160001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/160001

[commit-bot: I haz the power, 2015-09-15 13:12:49]

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

[commit-bot: I haz the power, 2015-09-15 13:12:51]

Try jobs failed on following builders:
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)

[PEConn, 2015-09-15 13:47:53]

peconn@chromium.org changed reviewers:
+ sky@chromium.org

[PEConn, 2015-09-15 13:47:54]

sky@chromium.org: At your convenience (you've been TBR'd) could you review
changes in the following files. They're all trivial/formatting changes.

chrome/browser/android/preferences/pref_service_bridge.cc
chrome/browser/android/preferences/website_preference_bridge.cc
chrome/browser/apps/guest_view/web_view_browsertest.cc
chrome/browser/banners/app_banner_settings_helper.cc
chrome/browser/browsing_data/browsing_data_remover.cc
chrome/browser/browsing_data/cookies_tree_model_unittest.cc
chrome/browser/chrome_content_browser_client.cc
chrome/browser/content_settings/content_settings_browsertest.cc
chrome/browser/content_settings/content_settings_usages_state_unittest.cc
chrome/browser/content_settings/host_content_settings_map_unittest.cc
chrome/browser/content_settings/tab_specific_content_settings.cc
chrome/browser/download/download_request_limiter.cc
chrome/browser/engagement/site_engagement_service.cc
chrome/browser/extensions/api/content_settings/content_settings_api.cc
chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
chrome/browser/extensions/extension_special_storage_policy_unittest.cc
chrome/browser/extensions/plugin_apitest.cc
chrome/browser/extensions/webstore_inline_installer_browsertest.cc
chrome/browser/geolocation/geolocation_browsertest.cc
chrome/browser/geolocation/geolocation_permission_context_unittest.cc
chrome/browser/geolocation/geolocation_settings_state_unittest.cc
chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
chrome/browser/media/media_stream_device_permission_context_unittest.cc
chrome/browser/media/media_stream_devices_controller_browsertest.cc
chrome/browser/media/media_stream_devices_controller.cc
chrome/browser/media/midi_permission_context_unittest.cc
chrome/browser/notifications/desktop_notification_profile_util.cc
chrome/browser/notifications/message_center_settings_controller_unittest.cc
chrome/browser/notifications/message_center_settings_controller.cc
chrome/browser/notifications/notification_browsertest.cc
chrome/browser/notifications/platform_notification_service_impl.cc
chrome/browser/notifications/platform_notification_service_unittest.cc
chrome/browser/pepper_broker_infobar_delegate.cc
chrome/browser/permissions/permission_context_base_unittest.cc
chrome/browser/permissions/permission_context_base.cc
chrome/browser/permissions/permission_manager.cc
chrome/browser/permissions/permission_queue_controller.cc
chrome/browser/plugins/plugin_info_message_filter_unittest.cc
chrome/browser/plugins/plugin_info_message_filter.cc
chrome/browser/prerender/prerender_browsertest.cc
chrome/browser/profile_resetter/profile_resetter_unittest.cc
chrome/browser/profile_resetter/profile_resetter.cc
chrome/browser/profiles/profile_io_data.cc
chrome/browser/push_messaging/push_messaging_browsertest.cc
chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc
chrome/browser/push_messaging/push_messaging_permission_context.cc
chrome/browser/push_messaging/push_messaging_service_impl.cc
chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
chrome/browser/signin/chrome_signin_client.cc
chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
chrome/browser/ssl/ssl_browser_tests.cc
chrome/browser/supervised_user/supervised_user_pref_store.cc
chrome/browser/supervised_user/supervised_user_settings_service.h
chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc
chrome/browser/ui/app_list/test/fake_profile.cc
chrome/browser/ui/app_list/test/fake_profile.h
chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc
chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
chrome/browser/ui/content_settings/content_setting_bubble_model.cc
chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
chrome/browser/ui/content_settings/content_setting_image_model.cc
chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc
chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc
chrome/browser/ui/exclusive_access/fullscreen_controller.cc
chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
chrome/browser/ui/website_settings/website_settings_unittest.cc
chrome/browser/ui/website_settings/website_settings.cc
chrome/browser/ui/webui/options/content_settings_handler.cc
chrome/browser/ui/webui/plugins_ui.cc
chrome/chrome_browser.gypi
chrome/test/base/testing_profile.cc
chrome/test/base/testing_profile.h
chrome/test/ppapi/ppapi_browsertest.cc
chrome/test/ppapi/ppapi_interactive_browsertest.cc
chrome/test/ppapi/ppapi_test.cc

[PEConn, 2015-09-15 15:39:00]

The CQ bit was checked by peconn@chromium.org

[PEConn, 2015-09-15 15:39:00]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org,
benwells@chromium.org, mlamouri@chromium.org, peter@chromium.org,
erg@chromium.org, dgrogan@chromium.org, dalecurtis@chromium.org,
mvanouwerkerk@chromium.org
Link to the patchset: https://codereview.chromium.org/1312453005/#ps180001
(title: "Fixed patch conflict")

[commit-bot: I haz the power, 2015-09-15 15:39:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/180001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/180001

[commit-bot: I haz the power, 2015-09-15 17:40:56]

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

[commit-bot: I haz the power, 2015-09-15 17:40:58]

Try jobs failed on following builders:
  win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[PEConn, 2015-09-16 08:33:01]

The CQ bit was checked by peconn@chromium.org

[commit-bot: I haz the power, 2015-09-16 08:33:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/180001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/180001

[commit-bot: I haz the power, 2015-09-16 08:57:57]

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

[commit-bot: I haz the power, 2015-09-16 08:57:59]

Try jobs failed on following builders:
  win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[PEConn, 2015-09-16 09:06:14]

The CQ bit was checked by peconn@chromium.org

[commit-bot: I haz the power, 2015-09-16 09:06:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/180001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/180001

[commit-bot: I haz the power, 2015-09-16 09:44:03]

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

[commit-bot: I haz the power, 2015-09-16 09:44:05]

Try jobs failed on following builders:
  win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[PEConn, 2015-09-16 11:17:14]

The CQ bit was checked by peconn@chromium.org

[commit-bot: I haz the power, 2015-09-16 11:17:24]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1312453005/180001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1312453005/180001

[commit-bot: I haz the power, 2015-09-16 12:03:18]

Committed patchset #6 (id:180001)

[commit-bot: I haz the power, 2015-09-16 12:04:10]

Patchset 6 (id:??) landed as
https://crrev.com/5100d43a99c1c6657162db57cc3dde53a5b55277
Cr-Commit-Position: refs/heads/master@{#349099}

[commit-bot: I haz the power, 2015-09-23 12:54:41]

Patchset 6 (id:??) landed as
https://crrev.com/5100d43a99c1c6657162db57cc3dde53a5b55277
Cr-Commit-Position: refs/heads/master@{#349099}