Convert ProtocolHandlerRegistry to be a ProfileKeyedService.

chrome/browser/profiles/profile_io_data.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/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
+#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/extensions/extension_resource_protocols.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
 #include "chrome/browser/net/chrome_net_log.h"
@@ skipping 72 matching lines @@
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_COOKIE_CHANGED,
           content::Source<Profile>(profile),
           content::Details<ChromeCookieDetails>(&cookie_details));
     }
   }
 
   const base::Callback<Profile*(void)> profile_getter_;
 };
 
-class ProtocolHandlerRegistryInterceptor
-    : public net::URLRequestJobFactory::Interceptor {
- public:
-  explicit ProtocolHandlerRegistryInterceptor(
-      ProtocolHandlerRegistry* protocol_handler_registry)
-      : protocol_handler_registry_(protocol_handler_registry) {
-    DCHECK(protocol_handler_registry_);
-  }
-
-  virtual ~ProtocolHandlerRegistryInterceptor() {}
-
-  virtual net::URLRequestJob* MaybeIntercept(
-      net::URLRequest* request) const OVERRIDE {
-    return protocol_handler_registry_->MaybeCreateJob(request);
-  }
-
-  virtual bool WillHandleProtocol(const std::string& protocol) const {
-    return protocol_handler_registry_->IsHandledProtocolIO(protocol);
-  }
-
-  virtual net::URLRequestJob* MaybeInterceptRedirect(
-      const GURL& url, net::URLRequest* request) const OVERRIDE {
-    return NULL;
-  }
-
-  virtual net::URLRequestJob* MaybeInterceptResponse(
-      net::URLRequest* request) const OVERRIDE {
-    return NULL;
-  }
-
- private:
-  const scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProtocolHandlerRegistryInterceptor);
-};
-
 Profile* GetProfileOnUI(ProfileManager* profile_manager, Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
   if (profile_manager->IsValidProfile(profile))
     return profile;
   return NULL;
 }
 
 }  // namespace
 
@@ skipping 35 matching lines @@
   params->cookie_monster_delegate =
       new ChromeCookieMonsterDelegate(profile_getter);
   params->extension_info_map =
       ExtensionSystem::Get(profile)->info_map();
 
 #if defined(ENABLE_NOTIFICATIONS)
   params->notification_service =
       DesktopNotificationServiceFactory::GetForProfile(profile);
 #endif
 
-  params->protocol_handler_registry = profile->GetProtocolHandlerRegistry();
+  ProtocolHandlerRegistry* proto_handlers =

[willchan no longer on Chromium, 2012/06/22 23:15:44]

The style guide discourages abbreviations. Please call this
protocol_handler_registry.

[smckay, 2012/06/22 23:44:31]

Done.

+      ProtocolHandlerRegistryFactory::GetForProfile(profile);
+  DCHECK(proto_handlers);
+
+  // the profile instance is only available here in the InitializeOnUIThread
+  // method, so we create the url interceptor here, then save it for
+  // later delivery to the job factory in LazyInitialize
+  params->protocol_handler_url_interceptor =
+      proto_handlers->CreateIOURLInterceptor();
 
   ChromeProxyConfigService* proxy_config_service =
       ProxyServiceFactory::CreateProxyConfigService(true);
   params->proxy_config_service.reset(proxy_config_service);
   profile->GetProxyConfigTracker()->SetChromeProxyConfigService(
       proxy_config_service);
   params->profile = profile;
   profile_params_.reset(params.release());
 
   // The URLBlacklistManager has to be created on the UI thread to register
@@ skipping 278 matching lines @@
       new TransportSecurityPersister(transport_security_state_.get(),
                                      profile_params_->path,
                                      is_incognito()));
   const std::string& serialized =
       command_line.GetSwitchValueASCII(switches::kHstsHosts);
   transport_security_persister_.get()->DeserializeFromCommandLine(serialized);
 
   // NOTE(willchan): Keep these protocol handlers in sync with
   // ProfileIOData::IsHandledProtocol().
   job_factory_.reset(new net::URLRequestJobFactory);
-  if (profile_params_->protocol_handler_registry) {
+  if (profile_params_->protocol_handler_url_interceptor) {
     job_factory_->AddInterceptor(
-        new ProtocolHandlerRegistryInterceptor(
-            profile_params_->protocol_handler_registry));
+        profile_params_->protocol_handler_url_interceptor);
   }
   bool set_protocol = job_factory_->SetProtocolHandler(
       chrome::kExtensionScheme,
       CreateExtensionProtocolHandler(is_incognito(),
                                      profile_params_->extension_info_map));
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kExtensionResourceScheme,
       CreateExtensionResourceProtocolHandler());
   DCHECK(set_protocol);
@@ skipping 64 matching lines @@
 }
 
 void ProfileIOData::set_server_bound_cert_service(
     net::ServerBoundCertService* server_bound_cert_service) const {
   server_bound_cert_service_.reset(server_bound_cert_service);
 }
 
 void ProfileIOData::DestroyResourceContext() {
   resource_context_.reset();
 }