Move common PVer4 code into a V4ProtocolManagerUtil class.

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 384 matching lines @@
   if (resource_request_detector_)
     resource_request_detector_->OnResourceRequest(request);
 #endif
 }
 
 SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
   return new SafeBrowsingUIManager(this);
 }
 
 SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
-  V4GetHashProtocolConfig config = GetV4GetHashProtocolConfig();
+  V4ProtocolConfig config = GetV4ProtocolConfig();
 #if defined(SAFE_BROWSING_DB_LOCAL)
   return new LocalSafeBrowsingDatabaseManager(this, NULL, config);
 #elif defined(SAFE_BROWSING_DB_REMOTE)
   return new RemoteSafeBrowsingDatabaseManager(NULL, config);
 #else
   return NULL;
 #endif
 }
 
 #if defined(FULL_SAFE_BROWSING)
@@ skipping 23 matching lines @@
       cmdline->HasSwitch(switches::kSbDisableAutoUpdate) ||
       cmdline->HasSwitch(switches::kDisableBackgroundNetworking);
   config.url_prefix = kSbDefaultURLPrefix;
   config.backup_connect_error_url_prefix = kSbBackupConnectErrorURLPrefix;
   config.backup_http_error_url_prefix = kSbBackupHttpErrorURLPrefix;
   config.backup_network_error_url_prefix = kSbBackupNetworkErrorURLPrefix;
 
   return config;
 }
 
-V4GetHashProtocolConfig
-SafeBrowsingService::GetV4GetHashProtocolConfig() const {
-  V4GetHashProtocolConfig config;
+V4ProtocolConfig
+SafeBrowsingService::GetV4ProtocolConfig() const {
+  V4ProtocolConfig config;
   config.client_name = GetProtocolConfigClientName();
   config.version = SafeBrowsingProtocolManagerHelper::Version();
   config.key_param = google_apis::GetAPIKey();;
 
   return config;
 }
 
 std::string SafeBrowsingService::GetProtocolConfigClientName() const {
   std::string client_name;
   // On Windows, get the safe browsing client name from the browser
@@ skipping 205 matching lines @@
 }
 
 void SafeBrowsingService::OnSendDownloadRecoveryReport(
     const std::string& report) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (ping_manager())
     ping_manager()->ReportThreatDetails(report);
 }
 
 }  // namespace safe_browsing