Refactor safe-browsing build-config definitions.

chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.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_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_FACTORY_H_
 #define CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_FACTORY_H_
 
 #include "base/basictypes.h"
 
 class SafeBrowsingService;
 
 namespace content {
 class ResourceContext;
 class ResourceThrottle;
 }
 
 namespace net {
 class URLRequest;
 }
 
-// Factory for creating a SafeBrowsingResourceThrottle. When FULL_SAFE_BROWSING
-// is enabled, creates a SafeBrowsingResourceThrottle. When MOBILE_SAFE_BROWSING
-// is enabled, the default implementation creates a null resource throttle,
-// therefore, a factory has to be registered before using this.
+// Factory for creating a SafeBrowsingResourceThrottle. When
+// SAFE_BROWSING_DATABASE is enabled, creates a
+// SafeBrowsingResourceThrottle. When only SAFE_BROWSING_SERVICE is enabled, the
+// default implementation creates a null resource throttle, therefore, a factory
+// has to be registered before using this.
 class SafeBrowsingResourceThrottleFactory {
  public:
-#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
+#if defined(SAFE_BROWSING_SERVICE)
   // Registers a factory. Does not take the ownership of the factory. The
   // caller has to make sure the factory stays alive and properly destroyed.
   static void RegisterFactory(SafeBrowsingResourceThrottleFactory* factory) {
     factory_ = factory;
   }
 #endif

[Ryan Sleevi, 2014/07/24 22:47:50]

Does it make sense to
1) Move the implementation to the .cc
2) Forward declare SafeBrowsingResourceThrottleFactory?

You'd then be able to get rid of this #ifdef entirely.

[Scott Hess - ex-Googler, 2014/07/29 22:52:31]

I cannot find anyone who calls this.  I'm breaking off this change into a
separate CL ( https://codereview.chromium.org/431433002/ ) and will circle back
once that discussion is complete.

[Scott Hess - ex-Googler, 2014/07/30 21:29:57]

OK, apparently Android uses it in some way, so I've shifted the #ifdef into the
implementation (via CL https://codereview.chromium.org/431433002 ).

 
   // Creates a new resource throttle for safe browsing
   static content::ResourceThrottle* Create(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
       bool is_subresource,
       SafeBrowsingService* service);
 
  protected:
   SafeBrowsingResourceThrottleFactory() { }
   virtual ~SafeBrowsingResourceThrottleFactory() { }
 
   virtual content::ResourceThrottle* CreateResourceThrottle(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
       bool is_subresource,
       SafeBrowsingService* service) = 0;
 
  private:
   static SafeBrowsingResourceThrottleFactory* factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingResourceThrottleFactory);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_FACTORY_H_