Refactor safe-browsing build-config definitions.

chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc

Index: chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc b/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc
index c4906c18ac21058146fbe9e6afccdbc1533908ed..a64754f08261c5031bd509e0dfe632849785401b 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc
+++ b/chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.cc
@@ -5,7 +5,8 @@
 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.h"
 
 #include "content/public/browser/resource_context.h"
-#if defined(FULL_SAFE_BROWSING)
+
+#if defined(SAFE_BROWSING_DATABASE)
 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
 #endif
 
@@ -21,18 +22,19 @@ ResourceThrottle* SafeBrowsingResourceThrottleFactory::Create(
     content::ResourceContext* resource_context,
     bool is_subresource,
     SafeBrowsingService* service) {
-
-#if defined(FULL_SAFE_BROWSING)
+#if defined(SAFE_BROWSING_SERVICE)
   if (factory_)
     return factory_->CreateResourceThrottle(
         request, resource_context, is_subresource, service);
+
+#if defined(SAFE_BROWSING_DATABASE)
+  // Throttle consults a local database before proceeding.
   return new SafeBrowsingResourceThrottle(request, is_subresource, service);
-#elif defined(MOBILE_SAFE_BROWSING)
-  if (factory_)
-    return factory_->CreateResourceThrottle(
-        request, resource_context, is_subresource, service);
+#else
   return NULL;
+#endif  // SAFE_BROWSING_DATABASE
+
 #else
 #error Need to define {FULL|MOBILE} SAFE_BROWSING mode.
-#endif
+#endif  // SAFE_BROWSING_SERVICE
 }