Stop including a continue URL for SafeBrowsing reports, to get the default confirmation page.

chrome/browser/safe_browsing/safe_browsing_util.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_util.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/google/google_util.h"
 #include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/escape.h"
-#include "unicode/locid.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
-// Continue to this URL after submitting the phishing report form.
-// TODO(paulg): Change to a Chrome specific URL.
-static const char kContinueUrlFormat[] =
-  "http://www.google.com/tools/firefox/toolbar/FT2/intl/%s/submit_success.html";
-
-static const char kReportParams[] = "?tpl=%s&continue=%s&url=%s";
+static const char kReportParams[] = "?tpl=%s&url=%s";
 
 // SBChunk ---------------------------------------------------------------------
 
 SBChunk::SBChunk()
     : chunk_number(0),
       list_id(0),
       is_add(false) {
 }
 
 SBChunk::~SBChunk() {}
@@ skipping 434 matching lines @@
   return list_name.compare(kBinUrlList) == 0;
 }
 
 bool IsBadbinhashList(const std::string& list_name) {
   return list_name.compare(kBinHashList) == 0;
 }
 
 GURL GeneratePhishingReportUrl(const std::string& report_page,
                                const std::string& url_to_report,
                                bool is_client_side_detection) {
-  icu::Locale locale = icu::Locale::getDefault();
-  const char* lang = locale.getLanguage();
-  if (!lang)
-    lang = "en";  // fallback
-  const std::string continue_esc = net::EscapeQueryParamValue(
-      base::StringPrintf(kContinueUrlFormat, lang), true);
   const std::string current_esc = net::EscapeQueryParamValue(url_to_report,
                                                              true);
 
 #if defined(OS_WIN)
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::string client_name(dist->GetSafeBrowsingName());
 #else
   std::string client_name("googlechrome");
 #endif
   if (is_client_side_detection)
     client_name.append("_csd");
 
   GURL report_url(report_page + base::StringPrintf(kReportParams,
                                                    client_name.c_str(),
-                                                   continue_esc.c_str(),
                                                    current_esc.c_str()));
   return google_util::AppendGoogleLocaleParam(report_url);
 }
 
 void StringToSBFullHash(const std::string& hash_in, SBFullHash* hash_out) {
   DCHECK_EQ(crypto::kSHA256Length, hash_in.size());
   memcpy(hash_out->full_hash, hash_in.data(), crypto::kSHA256Length);
 }
 
 std::string SBFullHashToString(const SBFullHash& hash) {
   DCHECK_EQ(crypto::kSHA256Length, sizeof(hash.full_hash));
   return std::string(hash.full_hash, sizeof(hash.full_hash));
 }
 }  // namespace safe_browsing_util