Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / renderer_host / safe_browsing_resource_throttle_factory.cc

diff --git a/src/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc b/src/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc
index c4906c1..7b1fe09 100644 (file)
--- a/src/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc
+++ b/src/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc
@@ -16,21 +16,24 @@ SafeBrowsingResourceThrottleFactory*
     SafeBrowsingResourceThrottleFactory::factory_ = NULL;
 
 // static
+void SafeBrowsingResourceThrottleFactory::RegisterFactory(
+    SafeBrowsingResourceThrottleFactory* factory) {
+  factory_ = factory;
+}
+
+// static
 ResourceThrottle* SafeBrowsingResourceThrottleFactory::Create(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     bool is_subresource,
     SafeBrowsingService* service) {
-
-#if defined(FULL_SAFE_BROWSING)
   if (factory_)
     return factory_->CreateResourceThrottle(
         request, resource_context, is_subresource, service);
+
+#if defined(FULL_SAFE_BROWSING)
   return new SafeBrowsingResourceThrottle(request, is_subresource, service);
 #elif defined(MOBILE_SAFE_BROWSING)
-  if (factory_)
-    return factory_->CreateResourceThrottle(
-        request, resource_context, is_subresource, service);
   return NULL;
 #else
 #error Need to define {FULL|MOBILE} SAFE_BROWSING mode.