componentize SafeBrowsingService

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 d124f5a5afa72b017b5e3bbc8227dce09df5b740..41037320d5382268f6f7a02b66a02dd96a3e0821 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -285,10 +285,7 @@ SafeBrowsingService* SafeBrowsingService::CreateSafeBrowsingService() {
 }
 
 SafeBrowsingService::SafeBrowsingService()
-    : services_delegate_(ServicesDelegate::Create(this)),
-      enabled_(false),
-      enabled_by_prefs_(false),
-      enabled_v4_only_(safe_browsing::V4FeatureList::IsV4OnlyEnabled()) {}
+    : services_delegate_(ServicesDelegate::Create(this)) {}
 
 SafeBrowsingService::~SafeBrowsingService() {
   // We should have already been shut down. If we're still enabled, then the
@@ -393,6 +390,8 @@ SafeBrowsingService::url_request_context() {
   return url_request_context_getter_;
 }
 
+// TODO(ntfschr): componentize this once BaseSafeBrowsingUIManager contains a
+// SafeBrowsingService
 const scoped_refptr<SafeBrowsingUIManager>&
 SafeBrowsingService::ui_manager() const {
   return ui_manager_;
@@ -463,6 +462,8 @@ void SafeBrowsingService::OnResourceRequest(const net::URLRequest* request) {
 #endif
 }
 
+// TODO(ntfschr): componentize this once BaseSafeBrowsingUIManager contains a
+// SafeBrowsingService
 SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
   return new SafeBrowsingUIManager(this);
 }
@@ -511,31 +512,6 @@ SafeBrowsingService::GetV4ProtocolConfig() const {
       google_apis::GetAPIKey(), SafeBrowsingProtocolManagerHelper::Version());
 }
 
-std::string SafeBrowsingService::GetProtocolConfigClientName() const {
-  std::string client_name;
-  // On Windows, get the safe browsing client name from the browser
-  // distribution classes in installer util. These classes don't yet have
-  // an analog on non-Windows builds so just keep the name specified here.
-#if defined(OS_WIN)
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  client_name = dist->GetSafeBrowsingName();
-#else
-#if defined(GOOGLE_CHROME_BUILD)
-  client_name = "googlechrome";
-#else
-  client_name = "chromium";
-#endif
-
-  // Mark client string to allow server to differentiate mobile.
-#if defined(OS_ANDROID)
-  client_name.append("-a");
-#endif
-
-#endif  // defined(OS_WIN)
-
-  return client_name;
-}
-
 // Any tests that create a DatabaseManager that isn't derived from
 // LocalSafeBrowsingDatabaseManager should override this to return NULL.
 SafeBrowsingProtocolManagerDelegate*