componentize SafeBrowsingService

chrome/browser/safe_browsing/safe_browsing_service.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/safe_browsing/safe_browsing_service.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 267 matching lines @@
 
 
 // static
 SafeBrowsingService* SafeBrowsingService::CreateSafeBrowsingService() {
   if (!factory_)
     factory_ = g_safe_browsing_service_factory_impl.Pointer();
   return factory_->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
   // database isn't going to be closed properly, which could lead to corruption.
   DCHECK(!enabled_);
 }
 
 void SafeBrowsingService::Initialize() {
   // Ensure FileTypePolicies's Singleton is instantiated during startup.
   // This guarantees we'll log UMA metrics about its state.
@@ skipping 84 matching lines @@
   return false;
 #endif
 }
 
 scoped_refptr<net::URLRequestContextGetter>
 SafeBrowsingService::url_request_context() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   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_;
 }
 
 const scoped_refptr<SafeBrowsingDatabaseManager>&
 SafeBrowsingService::database_manager() const {
   return enabled_v4_only_ ? v4_local_database_manager() : database_manager_;
 }
 
@@ skipping 50 matching lines @@
   TRACE_EVENT1("loader", "SafeBrowsingService::OnResourceRequest", "url",
                request->url().spec());
 
   ResourceRequestInfo info = ResourceRequestDetector::GetRequestInfo(request);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&SafeBrowsingService::ProcessResourceRequest, this, info));
 #endif
 }
 
+// TODO(ntfschr): componentize this once BaseSafeBrowsingUIManager contains a
+// SafeBrowsingService
 SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
   return new SafeBrowsingUIManager(this);
 }
 
 SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
 #if defined(SAFE_BROWSING_DB_LOCAL)
   return new LocalSafeBrowsingDatabaseManager(this);
 #elif defined(SAFE_BROWSING_DB_REMOTE)
   return new RemoteSafeBrowsingDatabaseManager();
 #else
@@ skipping 28 matching lines @@
 
 V4ProtocolConfig
 SafeBrowsingService::GetV4ProtocolConfig() const {
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   return V4ProtocolConfig(
       GetProtocolConfigClientName(),
       cmdline->HasSwitch(::switches::kDisableBackgroundNetworking),
       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*
 SafeBrowsingService::GetProtocolManagerDelegate() {
 #if defined(SAFE_BROWSING_DB_LOCAL)
   DCHECK(!enabled_v4_only_);
   return static_cast<LocalSafeBrowsingDatabaseManager*>(
       database_manager_.get());
 #else
   NOTREACHED();
@@ skipping 191 matching lines @@
     ping_manager()->ReportThreatDetails(report);
 }
 
 void SafeBrowsingService::ProcessResourceRequest(
     const ResourceRequestInfo& request) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   services_delegate_->ProcessResourceRequest(&request);
 }
 
 }  // namespace safe_browsing