Adding product names to safe browsing report_error and report_phish URLs on Windows. These names will be different for Google Chrome, Chromium and Chrome Frame. On Mac / Linux, leaving the name as "googlechrome" for all builds.

BUG=None
TEST=Verify that the safe browsing URLs are tagged with the correct product name for each product.


Review URL: http://codereview.chromium.org/455035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33702 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 2 deletions

diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 5d5b145..f036646 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -13,6 +13,10 @@
 #include "net/base/escape.h"
 #include "unicode/locid.h"
 
+#if defined(OS_WIN)
+#include "chrome/installer/util/browser_distribution.h"
+#endif
+
 static const int kSafeBrowsingMacDigestSize = 20;
 
 // Continue to this URL after submitting the phishing report form.
@@ -20,7 +24,7 @@ static const int kSafeBrowsingMacDigestSize = 20;
 static const char kContinueUrlFormat[] =
   "http://www.google.com/tools/firefox/toolbar/FT2/intl/%s/submit_success.html";
 
-static const char kReportParams[] = "?tpl=chrome&continue=%s&url=%s";
+static const char kReportParams[] = "?tpl=%s&continue=%s&url=%s";
 
 
 // SBEntry ---------------------------------------------------------------------
@@ -594,8 +598,17 @@ GURL GeneratePhishingReportUrl(const std::string& report_page,
   const std::string continue_esc =
       EscapeQueryParamValue(StringPrintf(kContinueUrlFormat, lang));
   const std::string current_esc = EscapeQueryParamValue(url_to_report);
+
+#if defined(OS_WIN)
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  std::string client_name(dist->GetSafeBrowsingName());
+#else
+  std::string client_name("googlechrome");
+#endif
+
   GURL report_url(report_page +
-      StringPrintf(kReportParams, continue_esc.c_str(), current_esc.c_str()));
+      StringPrintf(kReportParams, client_name.c_str(), continue_esc.c_str(),
+                   current_esc.c_str()));
   return google_util::AppendGoogleLocaleParam(report_url);
 }