Commit f91be88e authored by Greg Thompson's avatar Greg Thompson Committed by Chromium LUCI CQ

[setup] Update the uninstall survey URL.

Switch to using a p-link and drop the language query param.

BUG=1102713

Change-Id: I782b331d3baae302518b54535e1fcab149e6c549
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2585087Reviewed-by: default avatarYann Dago <ydago@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836813}
parent 09e49224
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "base/json/json_file_value_serializer.h" #include "base/json/json_file_value_serializer.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
...@@ -36,20 +36,8 @@ namespace installer { ...@@ -36,20 +36,8 @@ namespace installer {
namespace { namespace {
// Substitutes the locale parameter in |url| with whatever Google Update tells constexpr base::StringPiece16 kUninstallSurveyUrl(
// us is the locale. In case we fail to find the locale, we use US English. L"https://support.google.com/chrome?p=chrome_uninstall_survey");
base::string16 LocalizeUrl(const wchar_t* url) {
base::string16 language;
if (!GoogleUpdateSettings::GetLanguage(&language))
language = L"en-US"; // Default to US English.
return base::ReplaceStringPlaceholders(url, language, nullptr);
}
base::string16 GetUninstallSurveyUrl() {
static constexpr wchar_t kSurveyUrl[] =
L"https://support.google.com/chrome/contact/chromeuninstall3?hl=$1";
return LocalizeUrl(kSurveyUrl);
}
bool NavigateToUrlWithEdge(const base::string16& url) { bool NavigateToUrlWithEdge(const base::string16& url) {
base::string16 protocol_url = L"microsoft-edge:" + url; base::string16 protocol_url = L"microsoft-edge:" + url;
...@@ -201,7 +189,7 @@ void DoPostUninstallOperations(const base::Version& version, ...@@ -201,7 +189,7 @@ void DoPostUninstallOperations(const base::Version& version,
base::StringPrintf(L"%d.%d.%d", version_number.major, base::StringPrintf(L"%d.%d.%d", version_number.major,
version_number.minor, version_number.build); version_number.minor, version_number.build);
const base::string16 survey_url = GetUninstallSurveyUrl(); const base::string16 survey_url = base::string16(kUninstallSurveyUrl);
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
// The URL is expected to have a query part and not end with '&'. // The URL is expected to have a query part and not end with '&'.
const size_t pos = survey_url.find(L'?'); const size_t pos = survey_url.find(L'?');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment