Remove build time differences between Chrome Frame and Google Chrome in the...

chrome/browser/safe_browsing/protocol_manager.cc

 // Copyright (c) 2006-2008 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/protocol_manager.h"
 
 #include "base/file_version_info.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 33 matching lines @@
 // New MAC client key requests URL.
 static const char* const kSbNewKeyUrl =
     "https://sb-ssl.google.com/safebrowsing/newkey?client=%s&appver=%s"
     "&pver=2.2";
 
 // URL for reporting malware pages.
 static const char* const kSbMalwareReportUrl =
     "http://safebrowsing.clients.google.com/safebrowsing/report?evts=malblhit"
     "&evtd=%s&evtr=%s&evhr=%s&client=%s&appver=%s";
 
-#if defined(CHROME_FRAME_BUILD)
-static const char* const kSbClientName = "googlechromeframe";
-#elif defined(GOOGLE_CHROME_BUILD)
-static const char* const kSbClientName = "googlechrome";
-#else
-static const char* const kSbClientName = "chromium";
-#endif
-
 // Maximum back off multiplier.
 static const int kSbMaxBackOff = 8;
 
 
 // SafeBrowsingProtocolManager implementation ----------------------------------
 
 SafeBrowsingProtocolManager::SafeBrowsingProtocolManager(
     SafeBrowsingService* sb_service,
+    const std::string& client_name,
     const std::string& client_key,
     const std::string& wrapped_key)
     : sb_service_(sb_service),
       request_type_(NO_REQUEST),
       update_error_count_(0),
       gethash_error_count_(0),
       update_back_off_mult_(1),
       gethash_back_off_mult_(1),
       next_update_sec_(-1),
       update_state_(FIRST_REQUEST),
       initial_request_(true),
       chunk_pending_to_write_(false),
       client_key_(client_key),
       wrapped_key_(wrapped_key),
-      update_size_(0) {
+      update_size_(0),
+      client_name_(client_name) {
   // Set the backoff multiplier fuzz to a random value between 0 and 1.
   back_off_fuzz_ = static_cast<float>(base::RandDouble());
 
   // The first update must happen between 0-5 minutes of start up.
   next_update_sec_ = base::RandInt(60, kSbTimerStartIntervalSec);
 
   scoped_ptr<FileVersionInfo> version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   if (!version_info.get())
     version_ = "0.1";
@@ skipping 23 matching lines @@
   // If we are in GetHash backoff, we need to check if we're past the next
   // allowed time. If we are, we can proceed with the request. If not, we are
   // required to return empty results (i.e. treat the page as safe).
   if (gethash_error_count_ && Time::Now() <= next_gethash_time_) {
     std::vector<SBFullHashResult> full_hashes;
     sb_service_->HandleGetHashResults(check, full_hashes, false);
     return;
   }
 
   std::string url = StringPrintf(kSbGetHashUrl,
-                                 kSbClientName,
+                                 client_name_.c_str(),
                                  version_.c_str());
   if (!client_key_.empty()) {
     url.append("&wrkey=");
     url.append(wrapped_key_);
   }
 
   GURL gethash_url(url);
   URLFetcher* fetcher = new URLFetcher(gethash_url, URLFetcher::POST, this);
   hash_requests_[fetcher] = check;
 
@@ skipping 378 matching lines @@
   request_type_ = CHUNK_REQUEST;
   request_.reset(new URLFetcher(chunk_url, URLFetcher::GET, this));
   request_->set_load_flags(net::LOAD_DISABLE_CACHE);
   request_->set_request_context(Profile::GetDefaultRequestContext());
   chunk_request_start_ = base::Time::Now();
   request_->Start();
 }
 
 void SafeBrowsingProtocolManager::IssueKeyRequest() {
   GURL key_url(StringPrintf(kSbNewKeyUrl,
-                            kSbClientName,
+                            client_name_.c_str(),
                             version_.c_str()));
   request_type_ = GETKEY_REQUEST;
   request_.reset(new URLFetcher(key_url, URLFetcher::GET, this));
   request_->set_load_flags(net::LOAD_DISABLE_CACHE);
   request_->set_request_context(Profile::GetDefaultRequestContext());
   request_->Start();
 }
 
 void SafeBrowsingProtocolManager::OnGetChunksComplete(
     const std::vector<SBListChunkRanges>& lists, bool database_error) {
@@ skipping 24 matching lines @@
   // lists.
   if (!found_phishing)
     list_data.append(FormatList(
         SBListChunkRanges(safe_browsing_util::kPhishingList), use_mac));
 
   if (!found_malware)
     list_data.append(FormatList(
         SBListChunkRanges(safe_browsing_util::kMalwareList), use_mac));
 
   std::string url = StringPrintf(kSbUpdateUrl,
-                                 kSbClientName,
+                                 client_name_.c_str(),
                                  version_.c_str());
   if (use_mac) {
     url.append("&wrkey=");
     url.append(wrapped_key_);
   }
 
   GURL update_url(url);
   request_.reset(new URLFetcher(update_url, URLFetcher::POST, this));
   request_->set_load_flags(net::LOAD_DISABLE_CACHE);
   request_->set_request_context(Profile::GetDefaultRequestContext());
@@ skipping 26 matching lines @@
 }
 
 void SafeBrowsingProtocolManager::ReportMalware(const GURL& malware_url,
                                                 const GURL& page_url,
                                                 const GURL& referrer_url) {
   std::string report_str = StringPrintf(
       kSbMalwareReportUrl,
       EscapeQueryParamValue(malware_url.spec()).c_str(),
       EscapeQueryParamValue(page_url.spec()).c_str(),
       EscapeQueryParamValue(referrer_url.spec()).c_str(),
-      kSbClientName,
+      client_name_.c_str(),
       version_.c_str());
   GURL report_url(report_str);
   URLFetcher* report = new URLFetcher(report_url, URLFetcher::GET, this);
   report->set_load_flags(net::LOAD_DISABLE_CACHE);
   report->set_request_context(Profile::GetDefaultRequestContext());
   report->Start();
   malware_reports_.insert(report);
 }
 
 // static
@@ skipping 28 matching lines @@
 void SafeBrowsingProtocolManager::HandleGetHashError(const Time& now) {
   int next = GetNextBackOffTime(&gethash_error_count_, &gethash_back_off_mult_);
   next_gethash_time_ = now + TimeDelta::FromSeconds(next);
 }
 
 void SafeBrowsingProtocolManager::UpdateFinished(bool success) {
   UMA_HISTOGRAM_COUNTS("SB2.UpdateSize", update_size_);
   update_size_ = 0;
   sb_service_->UpdateFinished(success);
 }