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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 214 matching lines @@
   void UpdateProtectedContentExceptionsButton();
 
   // Member variables ---------------------------------------------------------
 
   content::NotificationRegistrar notification_registrar_;
   PrefChangeRegistrar pref_change_registrar_;
   scoped_ptr<PepperFlashSettingsManager> flash_settings_manager_;
   MediaSettingsInfo media_settings_;
   scoped_ptr<content::HostZoomMap::Subscription> host_zoom_map_subscription_;
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
+  ScopedObserver<HostContentSettingsMap, content_settings::Observer>

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

You can use the other observer for this.

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

Done.

+      otr_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_