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

chrome/browser/ui/webui/options/content_settings_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 250 matching lines @@
       default_setting(CONTENT_SETTING_DEFAULT),
       policy_disable_audio(false),
       policy_disable_video(false),
       default_setting_initialized(false),
       exceptions_initialized(false) {
 }
 
 ContentSettingsHandler::MediaSettingsInfo::~MediaSettingsInfo() {
 }
 
-ContentSettingsHandler::ContentSettingsHandler() : observer_(this) {
+ContentSettingsHandler::ContentSettingsHandler()
+    : observer_(this), otr_observer_(this) {
 }
 
 ContentSettingsHandler::~ContentSettingsHandler() {
 }
 
 void ContentSettingsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   // TODO(dhnishi): Standardize to lowerCamelCase.
@@ skipping 238 matching lines @@
   else
     UpdateExceptionsViewFromModel(details.type());
 }
 
 void ContentSettingsHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       if (content::Source<Profile>(source).ptr()->IsOffTheRecord()) {

[Bernhard Bauer, 2014/09/19 18:18:50]

Do we want to stop observing the OTR profile in this case? I think we do.

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

Done.

         web_ui()->CallJavascriptFunction(
             "ContentSettingsExceptionsArea.OTRProfileDestroyed");
       }
       break;
     }
 
     case chrome::NOTIFICATION_PROFILE_CREATED: {
-      if (content::Source<Profile>(source).ptr()->IsOffTheRecord())
+      Profile* profile = content::Source<Profile>(source).ptr();
+      if (profile->IsOffTheRecord()) {
         UpdateAllOTRExceptionsViewsFromModel();
+
+        if (profile->GetOriginalProfile() != profile)

[Bernhard Bauer, 2014/09/19 18:18:50]

In what super fun special case is the original profile for an OTR profile equal
the profile itself? Guest mode?

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

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.

+          otr_observer_.Add(profile->GetHostContentSettingsMap());
+      }
       break;
     }
 
     case chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED: {
       UpdateNotificationExceptionsView();
       break;
     }
 
     case chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED: {
       UpdateHandlersEnabledRadios();
@@ skipping 942 matching lines @@
 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   // Exceptions apply only when the feature is enabled.
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options