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

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

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 83e99e915d649078e2340feff2fbc43f8afd7cff..cdddc6c3b8e132ff832ea807beab004087a1b608 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -268,7 +268,8 @@ ContentSettingsHandler::MediaSettingsInfo::MediaSettingsInfo()
 ContentSettingsHandler::MediaSettingsInfo::~MediaSettingsInfo() {
 }
 
-ContentSettingsHandler::ContentSettingsHandler() : observer_(this) {
+ContentSettingsHandler::ContentSettingsHandler()
+    : observer_(this), otr_observer_(this) {
 }
 
 ContentSettingsHandler::~ContentSettingsHandler() {
@@ -535,8 +536,13 @@ void ContentSettingsHandler::Observe(
     }
 
     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;
     }