Componentize ping_manager

chrome/browser/safe_browsing/protocol_manager.cc

Index: chrome/browser/safe_browsing/protocol_manager.cc
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 4432206e12f416a056b0404afd64e8c6e93a9eb0..af2cb4d6b87af30d6552b023097cd87173000e23 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -166,7 +166,7 @@ SafeBrowsingProtocolManager::SafeBrowsingProtocolManager(
   // Set the backoff multiplier fuzz to a random value between 0 and 1.
   back_off_fuzz_ = static_cast<float>(base::RandDouble());
   if (version_.empty())
-    version_ = SafeBrowsingProtocolManagerHelper::Version();
+    version_ = Version();
 }
 
 // static
@@ -743,7 +743,7 @@ void SafeBrowsingProtocolManager::UpdateFinished(bool success, bool back_off) {
 
 GURL SafeBrowsingProtocolManager::UpdateUrl(
     ExtendedReportingLevel reporting_level) const {
-  std::string url = SafeBrowsingProtocolManagerHelper::ComposeUrl(
+  std::string url = ComposeUrl(
       url_prefix_, "downloads", client_name_, version_, additional_query_,
       reporting_level);
   return GURL(url);
@@ -754,7 +754,7 @@ GURL SafeBrowsingProtocolManager::BackupUpdateUrl(
   DCHECK(backup_update_reason >= 0 &&
          backup_update_reason < BACKUP_UPDATE_REASON_MAX);
   DCHECK(!backup_url_prefixes_[backup_update_reason].empty());
-  std::string url = SafeBrowsingProtocolManagerHelper::ComposeUrl(
+  std::string url = ComposeUrl(
       backup_url_prefixes_[backup_update_reason], "downloads", client_name_,
       version_, additional_query_);
   return GURL(url);
@@ -762,7 +762,7 @@ GURL SafeBrowsingProtocolManager::BackupUpdateUrl(
 
 GURL SafeBrowsingProtocolManager::GetHashUrl(
     ExtendedReportingLevel reporting_level) const {
-  std::string url = SafeBrowsingProtocolManagerHelper::ComposeUrl(
+  std::string url = ComposeUrl(
       url_prefix_, "gethash", client_name_, version_, additional_query_,
       reporting_level);
   return GURL(url);