Fix a bug where ContentSettingsHandler did not listen for OTR content settings changes.

Fix a bug where ContentSettingsHandler did not listen for OTR content settings changes.

BUG=415944
Committed: https://crrev.com/3d148e7d2053a90d90c13dff7055b8f7f44f5695
Cr-Commit-Position: refs/heads/master@{#296044}

[Daniel Nishi, 2014-09-19 17:16:35]

Patchset #1 (id:1) has been deleted

[Daniel Nishi, 2014-09-19 17:17:46]

Patchset #1 (id:20001) has been deleted

[Daniel Nishi, 2014-09-19 17:18:14]

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

[Daniel Nishi, 2014-09-19 17:18:17]

bauerb: PTAL.

[Bernhard Bauer, 2014-09-19 18:18:51]

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
File chrome/browser/ui/webui/options/content_settings_handler.cc (right):

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
chrome/browser/ui/webui/options/content_settings_handler.cc:531: if
(content::Source<Profile>(source).ptr()->IsOffTheRecord()) {
Do we want to stop observing the OTR profile in this case? I think we do.

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
chrome/browser/ui/webui/options/content_settings_handler.cc:543: if
(profile->GetOriginalProfile() != profile)
In what super fun special case is the original profile for an OTR profile equal
the profile itself? Guest mode?

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
File chrome/browser/ui/webui/options/content_settings_handler.h (right):

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
chrome/browser/ui/webui/options/content_settings_handler.h:235:
ScopedObserver<HostContentSettingsMap, content_settings::Observer>
You can use the other observer for this.

[Daniel Nishi, 2014-09-19 19:49:15]

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
File chrome/browser/ui/webui/options/content_settings_handler.cc (right):

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
chrome/browser/ui/webui/options/content_settings_handler.cc:531: if
(content::Source<Profile>(source).ptr()->IsOffTheRecord()) {
On 2014/09/19 18:18:50, Bernhard Bauer wrote:
> Do we want to stop observing the OTR profile in this case? I think we do.

Done.

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
chrome/browser/ui/webui/options/content_settings_handler.cc:543: if
(profile->GetOriginalProfile() != profile)
On 2014/09/19 18:18:50, Bernhard Bauer wrote:
> In what super fun special case is the original profile for an OTR profile
equal
> the profile itself? Guest mode?

It actually looks like the Guest Mode case is more complicated than this. I've
taken out the check and it works as it did before.

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
File chrome/browser/ui/webui/options/content_settings_handler.h (right):

https://codereview.chromium.org/585953003/diff/40001/chrome/browser/ui/webui/...
chrome/browser/ui/webui/options/content_settings_handler.h:235:
ScopedObserver<HostContentSettingsMap, content_settings::Observer>
On 2014/09/19 18:18:50, Bernhard Bauer wrote:
> You can use the other observer for this.

Done.

[Bernhard Bauer, 2014-09-22 08:31:26]

lgtm

[scheib, 2014-09-22 19:54:43]

The CQ bit was checked by scheib@chromium.org

[commit-bot: I haz the power, 2014-09-22 19:55:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/585953003/60001

[commit-bot: I haz the power, 2014-09-22 20:43:02]

Committed patchset #2 (id:60001) as dd51613931a4d69c175e7a64a72d17164d0cae53

[commit-bot: I haz the power, 2014-09-22 20:43:43]

Patchset 2 (id:??) landed as
https://crrev.com/3d148e7d2053a90d90c13dff7055b8f7f44f5695
Cr-Commit-Position: refs/heads/master@{#296044}