Convert ProtocolHandlerRegistry to be a ProfileKeyedService.

chrome/browser/ui/content_settings/content_setting_bubble_model.h

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.h
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
index 07c9773d8308982b212b9d493fd5636cf5ba14e1..2cbd58978efd646270cd46f88aa23c9df6dff886 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -19,6 +19,7 @@
 
 class ContentSettingBubbleModelDelegate;
 class Profile;
+class ProtocolHandlerRegistry;
 class TabContents;
 
 // This model provides data for ContentSettingBubble, and also controls
@@ -155,9 +156,17 @@ class ContentSettingTitleAndLinkModel : public ContentSettingBubbleModel {
 
 class ContentSettingRPHBubbleModel : public ContentSettingTitleAndLinkModel {
  public:
+
+  // Deprecated. Use constructor that accepts a |ProtocolHandlerRegistry|.

[Bernhard Bauer, 2012/07/19 20:52:56]

Remove this constructor please :)

+  ContentSettingRPHBubbleModel(Delegate* delegate,
+                               TabContents* tab_contents,
+                               Profile* profile,
+                               ContentSettingsType content_type);
+
   ContentSettingRPHBubbleModel(Delegate* delegate,
                                TabContents* tab_contents,
                                Profile* profile,
+                               ProtocolHandlerRegistry* registry,
                                ContentSettingsType content_type);
 
   virtual void OnRadioClicked(int radio_index) OVERRIDE;
@@ -171,12 +180,14 @@ class ContentSettingRPHBubbleModel : public ContentSettingTitleAndLinkModel {
     RPH_IGNORE,
   };
 
+  void Init();
   void RegisterProtocolHandler();
   void UnregisterProtocolHandler();
   void IgnoreProtocolHandler();
   void ClearOrSetPreviousHandler();
 
   int selected_item_;
+  ProtocolHandlerRegistry* registry_;
   ProtocolHandler pending_handler_;
   ProtocolHandler previous_handler_;
 };