Convert ProtocolHandlerRegistry to be a ProfileKeyedService.

chrome/browser/ui/content_settings/content_setting_bubble_model.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_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class ContentSettingBubbleModelDelegate;
 class Profile;
+class ProtocolHandlerRegistry;
 class TabContents;
 
 // This model provides data for ContentSettingBubble, and also controls
 // the action triggered when the allow / block radio buttons are triggered.
 class ContentSettingBubbleModel : public content::NotificationObserver {
  public:
   typedef ContentSettingBubbleModelDelegate Delegate;
 
   struct PopupItem {
     SkBitmap bitmap;
@@ skipping 116 matching lines @@
   void SetBlockedResources();
   void SetTitle();
   void SetManageLink();
   virtual void OnManageLinkClicked() OVERRIDE;
 
   Delegate* delegate_;
 };
 
 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;
 
  private:
   // These states must match the order of appearance of the radio buttons
   // in the XIB file for the Mac port.
   enum RPHState {
     RPH_ALLOW = 0,
     RPH_BLOCK,
     RPH_IGNORE,
   };
 
+  void Init();
   void RegisterProtocolHandler();
   void UnregisterProtocolHandler();
   void IgnoreProtocolHandler();
   void ClearOrSetPreviousHandler();
 
   int selected_item_;
+  ProtocolHandlerRegistry* registry_;
   ProtocolHandler pending_handler_;
   ProtocolHandler previous_handler_;
 };
 
 #endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_H_