Refactor safe-browsing build-config definitions

chrome/browser/renderer_host/safe_browsing_resource_throttle_factory.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/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
 
 using content::ResourceThrottle;
 
 // static
 SafeBrowsingResourceThrottleFactory*
     SafeBrowsingResourceThrottleFactory::factory_ = NULL;
 
 // static
 void SafeBrowsingResourceThrottleFactory::RegisterFactory(
     SafeBrowsingResourceThrottleFactory* factory) {
   factory_ = factory;
 }
 
 // static
 ResourceThrottle* SafeBrowsingResourceThrottleFactory::Create(
     net::URLRequest* request,
     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)
+#else
   return NULL;
-#else
-#error Need to define {FULL|MOBILE} SAFE_BROWSING mode.
 #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
+
 }