Refactor safe-browsing build-config definitions.

chrome/browser/profiles/profile.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/profiles/profile.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/pref_names.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
+// TODO(shess): Should possibly be SAFE_BROWSING_SERVICE.
 #if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING)
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #endif
 
 Profile::Profile()
     : restored_last_session_(false),
       sent_destroyed_notification_(false),
       accessibility_pause_level_(0) {
 }
 
@@ skipping 34 matching lines @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #endif
   registry->RegisterBooleanPref(
       prefs::kSessionExitedCleanly,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
       prefs::kSessionExitType,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  // TODO(shess): This seems wrongish.  Perhaps the API should be in the
+  // service, with the #if OS_ANDROID inside that implementation.
 #if defined(OS_ANDROID) && defined(FULL_SAFE_BROWSING)
   // During Finch trail, safe browsing should be turned off
   // by default, and not sync'ed with desktop.
   // If we want to enable safe browsing on Android, we will
   // need to remove this Android-specific code.
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingEnabled,
       SafeBrowsingService::IsEnabledByFieldTrial(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #else
@@ skipping 154 matching lines @@
         content::NotificationService::NoDetails());
   }
 }
 
 bool ProfileCompare::operator()(Profile* a, Profile* b) const {
   DCHECK(a && b);
   if (a->IsSameProfile(b))
     return false;
   return a->GetOriginalProfile() < b->GetOriginalProfile();
 }