Refactor safe-browsing build-config definitions.

chrome/browser/safe_browsing/safe_browsing_service.cc

Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 277b910f3c6e7adc7dfc099a4d34b64503dc8b4e..544b6fbcd3ae17325b0ceeef96d8f1981b70d19a 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -224,12 +224,17 @@ void SafeBrowsingService::Initialize() {
           make_scoped_refptr(g_browser_process->system_request_context())));
 
 #if defined(FULL_SAFE_BROWSING)
-#if !defined(OS_ANDROID)
+#if defined(SAFE_BROWSING_CSD)

[Lei Zhang, 2014/07/30 22:05:13]

This shouldn't need to be nested inside FULL_SAFE_BROWSING.

   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection)) {
     csd_service_.reset(safe_browsing::ClientSideDetectionService::Create(
         url_request_context_getter_.get()));
   }
+#endif
+
+  // TODO(shess): Adding SAFE_BROWSING_SERVICE_DOWNLOAD to control this might
+  // allow removing FULL_SAFE_BROWSING above.
+#if !defined(OS_ANDROID)
   download_service_.reset(new safe_browsing::DownloadProtectionService(
       this, url_request_context_getter_.get()));
 #endif
@@ -337,7 +342,7 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
 }
 
 SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
-#if defined(FULL_SAFE_BROWSING)
+#if defined(SAFE_BROWSING_DATABASE)
   return new SafeBrowsingDatabaseManager(this);
 #else
   return NULL;
@@ -424,7 +429,7 @@ void SafeBrowsingService::StartOnIOThread(
 
   SafeBrowsingProtocolConfig config = GetProtocolConfig();
 
-#if defined(FULL_SAFE_BROWSING)
+#if defined(SAFE_BROWSING_DATABASE)
   DCHECK(database_manager_.get());
   database_manager_->StartOnIOThread();
 
@@ -442,7 +447,7 @@ void SafeBrowsingService::StartOnIOThread(
 void SafeBrowsingService::StopOnIOThread(bool shutdown) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-#if defined(FULL_SAFE_BROWSING)
+#if defined(SAFE_BROWSING_DATABASE)
   database_manager_->StopOnIOThread(shutdown);
 #endif
   ui_manager_->StopOnIOThread(shutdown);
@@ -450,7 +455,7 @@ void SafeBrowsingService::StopOnIOThread(bool shutdown) {
   if (enabled_) {
     enabled_ = false;
 
-#if defined(FULL_SAFE_BROWSING)
+#if defined(SAFE_BROWSING_DATABASE)
     // This cancels all in-flight GetHash requests. Note that database_manager_
     // relies on the protocol_manager_ so if the latter is destroyed, the
     // former must be stopped.