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 99c913f3347799d59d7cab8f273de3129e556131..7b050b46d1f26afad8e99386ed95946c71355f27 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_DB_LOCAL)
 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
 #endif
 
@@ -27,15 +28,24 @@ ResourceThrottle* SafeBrowsingResourceThrottleFactory::Create(
     content::ResourceContext* resource_context,
     content::ResourceType resource_type,
     SafeBrowsingService* service) {
+#if defined(SAFE_BROWSING_SERVICE)
   if (factory_)
     return factory_->CreateResourceThrottle(
         request, resource_context, resource_type, service);
 
-#if defined(FULL_SAFE_BROWSING)
+#if defined(SAFE_BROWSING_DB_LOCAL)
+  // Throttle consults a local database before proceeding.
   return new SafeBrowsingResourceThrottle(request, resource_type, service);
-#elif defined(MOBILE_SAFE_BROWSING)
-  return NULL;
 #else
-#error Need to define {FULL|MOBILE} SAFE_BROWSING mode.
+  return NULL;
 #endif
+
+#else  // !SAFE_BROWSING_SERVICE
+  // Compiling this file only makes sense if SAFE_BROWSING_SERVICE is enabled.
+  // If the build is breaking here, it probably means that a gyp or gn file has
+  // been modified to build this file with safe_browsing=0 (gn
+  // safe_browsing_mode=0).
+#error Need to define safe_browsing mode.

[Lei Zhang (Do not use), 2015/04/17 18:30:51]

I'd put this check at the top of the file.

+#endif  // SAFE_BROWSING_SERVICE
+
 }