Listen to Off The Record profiles in ContentSettingsHandler.

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 479 matching lines @@
           base::Unretained(this)));
 
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetDefaultForBrowserContext(context);
   host_zoom_map_subscription_ =
       host_zoom_map->AddZoomLevelChangedCallback(
           base::Bind(&ContentSettingsHandler::OnZoomLevelChanged,
                      base::Unretained(this)));
 
   flash_settings_manager_.reset(new PepperFlashSettingsManager(this, context));
-  observer_.Add(Profile::FromWebUI(web_ui())->GetHostContentSettingsMap());
+
+  Profile* profile = Profile::FromWebUI(web_ui());
+  observer_.Add(profile->GetHostContentSettingsMap());
+  if (profile->HasOffTheRecordProfile()) {
+    observer_.Add(
+      profile->GetOffTheRecordProfile()->GetHostContentSettingsMap());
+  }
 }
 
 void ContentSettingsHandler::InitializePage() {
   media_settings_ = MediaSettingsInfo();
   RefreshFlashMediaSettings();
 
   UpdateHandlersEnabledRadios();
   UpdateAllExceptionsViewsFromModel();
   UpdateProtectedContentExceptionsButton();
 }
@@ skipping 11 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()) {
+      Profile* profile = content::Source<Profile>(source).ptr();
+      if (profile->IsOffTheRecord()) {
         web_ui()->CallJavascriptFunction(
             "ContentSettingsExceptionsArea.OTRProfileDestroyed");
+        observer_.Remove(profile->GetHostContentSettingsMap());

[Lei Zhang, 2014/10/24 19:57:29]

Can't we potentially failed the newly added DCHECK in ScopedObserver if we:

1) Start with Profile A and Profile B, both profiles have OTR profiles.

2) At some point ContentSettingsHandler::InitializeHandler() runs with Profile A
as the Profile::FromWebUI() result.

- |observers_| now contains Profile A and Profile A/OTR.

3) Profile B/OTR gets destroyed. This notification observer gets called.

- Attempts to remove Profile B/OTR, which isn't in |observers_|.

[scheib, 2014/10/24 21:46:19]

Good catch. I've added a check.

       }
       break;
     }
 
     case chrome::NOTIFICATION_PROFILE_CREATED: {
-      if (content::Source<Profile>(source).ptr()->IsOffTheRecord())
+      Profile* profile = content::Source<Profile>(source).ptr();
+      if (profile->IsOffTheRecord()) {
         UpdateAllOTRExceptionsViewsFromModel();
+        observer_.Add(profile->GetHostContentSettingsMap());
+      }
       break;
     }
 
     case chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED: {
       UpdateNotificationExceptionsView();
       break;
     }
 
     case chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED: {
       UpdateHandlersEnabledRadios();
@@ skipping 948 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options