Do not append Google locale to help center links

chrome/browser/ui/webui/ntp/ntp_resource_cache.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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 63 matching lines @@
 #if defined(OS_CHROMEOS)
     "https://www.google.com/support/chromeos/bin/answer.py?answer=95464";
 #else
     "https://www.google.com/support/chrome/bin/answer.py?answer=95464";
 #endif
 
 // The URL for the Learn More page shown on guest session new tab.
 const char kLearnMoreGuestSessionUrl[] =
     "https://www.google.com/support/chromeos/bin/answer.py?answer=1057090";
 
-base::string16 GetUrlWithLang(const GURL& url) {
-  return base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam(url).spec());
-}
-
 std::string SkColorToRGBAString(SkColor color) {
   // We convert the alpha using DoubleToString because StringPrintf will use
   // locale specific formatters (e.g., use , instead of . in German).
   return base::StringPrintf(
       "rgba(%d,%d,%d,%s)",
       SkColorGetR(color),
       SkColorGetG(color),
       SkColorGetB(color),
       base::DoubleToString(SkColorGetA(color) / 255.0).c_str());
 }
@@ skipping 209 matching lines @@
     localized_strings.SetString("incognitoTabDescription",
         l10n_util::GetStringUTF16(new_tab_description_ids));
     localized_strings.SetString("incognitoTabHeading",
         l10n_util::GetStringUTF16(new_tab_heading_ids));
     localized_strings.SetString("incognitoTabWarning",
         l10n_util::GetStringUTF16(new_tab_warning_ids));
   }
 
   localized_strings.SetString("learnMore",
       l10n_util::GetStringUTF16(new_tab_link_ids));
-  localized_strings.SetString("learnMoreLink",
-      GetUrlWithLang(GURL(new_tab_link)));
+  localized_strings.SetString("learnMoreLink", GURL(new_tab_link).spec());
 
   bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
       prefs::kShowBookmarkBar);
   localized_strings.SetBoolean("bookmarkbarattached", bookmark_bar_attached);
 
   webui::SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           new_tab_html_idr));
@@ skipping 25 matching lines @@
   if (!enterprise_domain.empty()) {
     // Device is enterprise enrolled.
     localized_strings.SetString("enterpriseInfoVisible", "true");
     base::string16 enterprise_info = l10n_util::GetStringFUTF16(
         IDS_DEVICE_OWNED_BY_NOTICE,
         base::UTF8ToUTF16(enterprise_domain));
     localized_strings.SetString("enterpriseInfoMessage", enterprise_info);
     localized_strings.SetString("enterpriseLearnMore",
         l10n_util::GetStringUTF16(IDS_LEARN_MORE));
     localized_strings.SetString("enterpriseInfoHintLink",
-        GetUrlWithLang(GURL(chrome::kLearnMoreEnterpriseURL)));
+        GURL(chrome::kLearnMoreEnterpriseURL).spec());
   } else {
     localized_strings.SetString("enterpriseInfoVisible", "false");
   }
 #endif
 
   localized_strings.SetString("guestTabDescription",
       l10n_util::GetStringUTF16(guest_tab_description_ids));
   localized_strings.SetString("guestTabHeading",
       l10n_util::GetStringUTF16(guest_tab_heading_ids));
   localized_strings.SetString("learnMore",
       l10n_util::GetStringUTF16(guest_tab_link_ids));
   localized_strings.SetString("learnMoreLink",
-      GetUrlWithLang(GURL(guest_tab_link)));
+      GURL(guest_tab_link).spec());
 
   webui::SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece guest_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(guest_tab_ids));
 
   std::string full_html = webui::GetI18nTemplateHtml(
       guest_tab_html, &localized_strings);
 
   new_tab_guest_html_ = base::RefCountedString::TakeString(&full_html);
@@ skipping 68 matching lines @@
                             NTPLoginHandler::ShouldShow(profile_));
   load_time_data.SetString("otherSessions",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_LABEL));
   load_time_data.SetString("otherSessionsEmpty",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_EMPTY));
   load_time_data.SetString("otherSessionsLearnMoreUrl",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_LEARN_MORE_URL));
   load_time_data.SetString("learnMore",
       l10n_util::GetStringUTF16(IDS_LEARN_MORE));
   load_time_data.SetString("webStoreLink",
-      GetUrlWithLang(GURL(extension_urls::GetWebstoreLaunchURL())));
+      google_util::AppendGoogleLocaleParam(
+          GURL(extension_urls::GetWebstoreLaunchURL())).spec());
   load_time_data.SetString("appInstallHintText",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_INSTALL_HINT_LABEL));
   load_time_data.SetBoolean("isDiscoveryInNTPEnabled",
       NewTabUI::IsDiscoveryInNTPEnabled());
   load_time_data.SetString("collapseSessionMenuItemText",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_COLLAPSE_SESSION));
   load_time_data.SetString("expandSessionMenuItemText",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_EXPAND_SESSION));
   load_time_data.SetString("restoreSessionMenuItemText",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_OPEN_ALL));
@@ skipping 243 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }