Convert ProtocolHandlerRegistry to be a ProfileKeyedService.

chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ skipping 233 matching lines @@
 
 TEST_F(ContentSettingBubbleModelTest, RegisterProtocolHandler) {
   const GURL page_url("http://toplevel.example/");
   NavigateAndCommit(page_url);
   TabSpecificContentSettings* content_settings =
       tab_contents()->content_settings();
   content_settings->set_pending_protocol_handler(
       ProtocolHandler::CreateProtocolHandler("mailto",
           GURL("http://www.toplevel.example/"), ASCIIToUTF16("Handler")));
 
-  scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, tab_contents(), profile(),
-          CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS));
+  ContentSettingRPHBubbleModel content_setting_bubble_model(
+          NULL, tab_contents(), profile(), NULL,
+          CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS);
+
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
-      content_setting_bubble_model->bubble_content();
+      content_setting_bubble_model.bubble_content();
   EXPECT_FALSE(bubble_content.title.empty());
   EXPECT_FALSE(bubble_content.radio_group.radio_items.empty());
   EXPECT_TRUE(bubble_content.popup_items.empty());
   EXPECT_TRUE(bubble_content.domain_lists.empty());
   EXPECT_TRUE(bubble_content.custom_link.empty());
   EXPECT_FALSE(bubble_content.custom_link_enabled);
   EXPECT_FALSE(bubble_content.manage_link.empty());
 }
 
 class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
@@ skipping 18 matching lines @@
 
   virtual void RegisterWithOSAsDefaultClient(
       const std::string& protocol,
       ProtocolHandlerRegistry* registry) {
     LOG(INFO) << "Register With OS";
   }
 };
 
 TEST_F(ContentSettingBubbleModelTest, RPHAllow) {
   StartIOThread();
-  profile()->CreateProtocolHandlerRegistry(new FakeDelegate);
+
+  ProtocolHandlerRegistry registry(profile(), new FakeDelegate());
+  registry.InitProtocolSettings();
 
   const GURL page_url("http://toplevel.example/");
   NavigateAndCommit(page_url);
   TabSpecificContentSettings* content_settings =
       tab_contents()->content_settings();
   ProtocolHandler test_handler = ProtocolHandler::CreateProtocolHandler(
       "mailto", GURL("http://www.toplevel.example/"),
       ASCIIToUTF16("Handler"));
   content_settings->set_pending_protocol_handler(test_handler);
 
-  scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, tab_contents(), profile(),
-          CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS));
+  ContentSettingRPHBubbleModel content_setting_bubble_model(
+          NULL, tab_contents(), profile(), &registry,
+          CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS);
 
   {
-    ProtocolHandler handler =
-        profile()->GetProtocolHandlerRegistry()->GetHandlerFor("mailto");
+    ProtocolHandler handler = registry.GetHandlerFor("mailto");
     EXPECT_TRUE(handler.IsEmpty());
     EXPECT_EQ(CONTENT_SETTING_DEFAULT,
               content_settings->pending_protocol_handler_setting());
   }
 
   // "0" is the "Allow" radio button.
-  content_setting_bubble_model->OnRadioClicked(0);
+  content_setting_bubble_model.OnRadioClicked(0);
   {
-    ProtocolHandler handler =
-        profile()->GetProtocolHandlerRegistry()->GetHandlerFor("mailto");
+    ProtocolHandler handler = registry.GetHandlerFor("mailto");
     ASSERT_FALSE(handler.IsEmpty());
     EXPECT_EQ(ASCIIToUTF16("Handler"), handler.title());
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               content_settings->pending_protocol_handler_setting());
   }
 
   // "1" is the "Deny" radio button.
-  content_setting_bubble_model->OnRadioClicked(1);
+  content_setting_bubble_model.OnRadioClicked(1);
   {
-    ProtocolHandler handler =
-        profile()->GetProtocolHandlerRegistry()->GetHandlerFor("mailto");
+    ProtocolHandler handler = registry.GetHandlerFor("mailto");
     EXPECT_TRUE(handler.IsEmpty());
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               content_settings->pending_protocol_handler_setting());
   }
 
   // "2" is the "Ignore button.
-  content_setting_bubble_model->OnRadioClicked(2);
+  content_setting_bubble_model.OnRadioClicked(2);
   {
-    ProtocolHandler handler =
-        profile()->GetProtocolHandlerRegistry()->GetHandlerFor("mailto");
+    ProtocolHandler handler = registry.GetHandlerFor("mailto");
     EXPECT_TRUE(handler.IsEmpty());
     EXPECT_EQ(CONTENT_SETTING_DEFAULT,
               content_settings->pending_protocol_handler_setting());
-    EXPECT_TRUE(profile()->GetProtocolHandlerRegistry()->IsIgnored(
-        test_handler));
+    EXPECT_TRUE(registry.IsIgnored(test_handler));
   }
 
   // "0" is the "Allow" radio button.
-  content_setting_bubble_model->OnRadioClicked(0);
+  content_setting_bubble_model.OnRadioClicked(0);
   {
-    ProtocolHandler handler =
-        profile()->GetProtocolHandlerRegistry()->GetHandlerFor("mailto");
+    ProtocolHandler handler = registry.GetHandlerFor("mailto");
     ASSERT_FALSE(handler.IsEmpty());
     EXPECT_EQ(ASCIIToUTF16("Handler"), handler.title());
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               content_settings->pending_protocol_handler_setting());
-    EXPECT_FALSE(profile()->GetProtocolHandlerRegistry()->IsIgnored(
-        test_handler));
+    EXPECT_FALSE(registry.IsIgnored(test_handler));
   }
 
-  // This must be done on the UI thread.
-  profile()->GetProtocolHandlerRegistry()->Finalize();
+  registry.Shutdown();
 }