Update a bunch of help center URLs.

This updates the first wave of links from
https://www.google.com/support/chrome paths to
https://support.google.com/chrome.  We also don't need
locale parameters on these links.

BUG=111556
TEST=manual
TBR=dhollowa

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

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

37 files changed, 159 insertions, 237 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f3599a2..bd1b45b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5150,9 +5150,6 @@ Because search results are requested even while you're typing your query, your d
       <message name="IDS_INSTANT_PREF_WARNING" desc="Warning displayed beneath instant pref">
         Omnibox input may be logged
       </message>
-      <message name="IDS_INSTANT_LEARN_MORE_URL" desc="URL of help center page that explains browser instant" translateable="false">
-        http://www.google.com/support/chrome/bin/answer.py?answer=180655&amp;hl=[GRITLANGCODE]
-      </message>
 
       <!-- Conflicts page -->
       <message name="IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_ONE" desc="What gets appended after the page title if no conflicts were found.">
diff --git a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc
index 008519f..22118a6 100644
--- a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc
+++ b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc
@@ -6,7 +6,6 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
@@ -88,8 +87,7 @@ bool RegisterProtocolHandlerInfoBarDelegate::LinkClicked(
   content::RecordAction(
       UserMetricsAction("RegisterProtocolHandler.InfoBar_LearnMore"));
   OpenURLParams params(
-      google_util::AppendGoogleLocaleParam(GURL(
-          chrome::kLearnMoreRegisterProtocolHandlerURL)),
+      GURL(chrome::kLearnMoreRegisterProtocolHandlerURL),
       Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK,
diff --git a/chrome/browser/download/download_shelf_context_menu.cc b/chrome/browser/download/download_shelf_context_menu.cc
index d667b09..7456b82 100644
--- a/chrome/browser/download/download_shelf_context_menu.cc
+++ b/chrome/browser/download/download_shelf_context_menu.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,7 +6,6 @@
 
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_prefs.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
@@ -113,8 +112,7 @@ void DownloadShelfContextMenu::ExecuteCommand(int command_id) {
     case LEARN_MORE: {
       Browser* browser = BrowserList::GetLastActive();
       DCHECK(browser && browser->is_type_tabbed());
-      GURL learn_more_url(chrome::kDownloadScanningLearnMoreURL);
-      OpenURLParams params(google_util::AppendGoogleLocaleParam(learn_more_url),
+      OpenURLParams params(GURL(chrome::kDownloadScanningLearnMoreURL),
                            content::Referrer(), NEW_FOREGROUND_TAB,
                            content::PAGE_TRANSITION_TYPED, false);
       browser->OpenURL(params);
diff --git a/chrome/browser/instant/instant_confirm_dialog.cc b/chrome/browser/instant/instant_confirm_dialog.cc
index 5ef3d87d..8702c13 100644
--- a/chrome/browser/instant/instant_confirm_dialog.cc
+++ b/chrome/browser/instant/instant_confirm_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,16 +9,11 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
-#include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace browser {
 
-GURL InstantLearnMoreURL() {
-  return GURL(l10n_util::GetStringUTF8(IDS_INSTANT_LEARN_MORE_URL));
-}
-
 void ShowInstantConfirmDialogIfNecessary(gfx::NativeWindow parent,
                                          Profile* profile) {
   PrefService* prefs = profile->GetPrefs();
diff --git a/chrome/browser/instant/instant_confirm_dialog.h b/chrome/browser/instant/instant_confirm_dialog.h
index e815265..fdfb094 100644
--- a/chrome/browser/instant/instant_confirm_dialog.h
+++ b/chrome/browser/instant/instant_confirm_dialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,14 +8,10 @@
 
 #include "ui/gfx/native_widget_types.h"
 
-class GURL;
 class Profile;
 
 namespace browser {
 
-// URL for learning more about instant.
-GURL InstantLearnMoreURL();
-
 // Invoked from the opt-in and preferences when the user toggles instant. If the
 // instant confirm dialog hasn't been shown, it's shown. If the instant dialog
 // has already been shown the dialog is not shown but the preference is toggled.
diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugin_observer.cc
index e380e8d..5ec70897 100644
--- a/chrome/browser/plugin_observer.cc
+++ b/chrome/browser/plugin_observer.cc
@@ -10,7 +10,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/plugin_finder.h"
 #include "chrome/browser/profiles/profile.h"
@@ -86,7 +85,7 @@ bool PluginInfoBarDelegate::Cancel() {
 
 bool PluginInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
   OpenURLParams params(
-      google_util::AppendGoogleLocaleParam(GURL(GetLearnMoreURL())), Referrer(),
+      GURL(GetLearnMoreURL()), Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK,
       false);
diff --git a/chrome/browser/resources/options/autofill_options.html b/chrome/browser/resources/options/autofill_options.html
index bfbd175..8fd534b 100644
--- a/chrome/browser/resources/options/autofill_options.html
+++ b/chrome/browser/resources/options/autofill_options.html
@@ -26,13 +26,6 @@
     </div>
   </div>
   <div>
-<if expr="pp_ifdef('chromeos')">
-    <a href="https://www.google.com/support/chromeos/bin/answer.py?answer=142893"
-        target="_blank" i18n-content="helpButton"></a>
-</if>
-<if expr="not pp_ifdef('chromeos')">
-    <a href="https://www.google.com/support/chrome/bin/answer.py?answer=142893"
-        target="_blank" i18n-content="helpButton"></a>
-</if>
+    <a target="_blank" i18n-values="href:helpUrl" i18n-content="helpButton"></a>
   </div>
 </div>
diff --git a/chrome/browser/resources/options2/autofill_options.html b/chrome/browser/resources/options2/autofill_options.html
index a605f90..2f54f74 100644
--- a/chrome/browser/resources/options2/autofill_options.html
+++ b/chrome/browser/resources/options2/autofill_options.html
@@ -26,13 +26,6 @@
     </div>
   </div>
   <div>
-<if expr="pp_ifdef('chromeos')">
-    <a href="https://www.google.com/support/chromeos/bin/answer.py?answer=142893"
-        target="_blank" i18n-content="helpButton"></a>
-</if>
-<if expr="not pp_ifdef('chromeos')">
-    <a href="https://www.google.com/support/chrome/bin/answer.py?answer=142893"
-        target="_blank" i18n-content="helpButton"></a>
-</if>
+    <a target="_blank" i18n-values="href:helpUrl" i18n-content="helpButton"></a>
   </div>
 </div>
diff --git a/chrome/browser/tab_contents/spelling_bubble_model.cc b/chrome/browser/tab_contents/spelling_bubble_model.cc
index f3af4cb..b9c9ae3 100644
--- a/chrome/browser/tab_contents/spelling_bubble_model.cc
+++ b/chrome/browser/tab_contents/spelling_bubble_model.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/tab_contents/spelling_bubble_model.h"
 
 #include "base/logging.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -63,7 +62,7 @@ string16 SpellingBubbleModel::GetLinkText() const {
 void SpellingBubbleModel::LinkClicked() {
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   OpenURLParams params(
-      google_util::AppendGoogleLocaleParam(GURL(chrome::kPrivacyLearnMoreURL)),
-      Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false);
+      GURL(chrome::kPrivacyLearnMoreURL), Referrer(), NEW_FOREGROUND_TAB,
+      content::PAGE_TRANSITION_LINK, false);
   browser->OpenURL(params);
 }
diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc
index 494ccb8..4680ef29 100644
--- a/chrome/browser/translate/options_menu_model.cc
+++ b/chrome/browser/translate/options_menu_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,10 +6,10 @@
 
 #include "base/metrics/histogram.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ -22,17 +22,6 @@ using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
-namespace {
-
-const char kAboutGoogleTranslateUrl[] =
-#if defined(OS_CHROMEOS)
-    "https://www.google.com/support/chromeos/bin/answer.py?answer=173424";
-#else
-    "https://www.google.com/support/chrome/bin/answer.py?answer=173424";
-#endif
-
-}  // namespace
-
 OptionsMenuModel::OptionsMenuModel(
     TranslateInfoBarDelegate* translate_delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
@@ -144,11 +133,9 @@ void OptionsMenuModel::ExecuteCommand(int command_id) {
       WebContents* web_contents =
           translate_infobar_delegate_->owner()->web_contents();
       if (web_contents) {
-        GURL about_url = google_util::AppendGoogleLocaleParam(
-            GURL(kAboutGoogleTranslateUrl));
         OpenURLParams params(
-            about_url, Referrer(), NEW_FOREGROUND_TAB,
-            content::PAGE_TRANSITION_LINK, false);
+            GURL(chrome::kAboutGoogleTranslateURL), Referrer(),
+            NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false);
         web_contents->OpenURL(params);
       }
       break;
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 055a0b8..c54aad0 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -59,7 +59,6 @@
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_unload_handler.h"
@@ -230,26 +229,6 @@ using content::WebContents;
 
 namespace {
 
-// The URL to be loaded to display Help.
-const char kHelpContentUrl[] =
-#if defined(OS_CHROMEOS)
-  #if defined(OFFICIAL_BUILD)
-      "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html";
-  #else
-      "https://www.google.com/support/chromeos/";
-  #endif
-#else
-    "https://www.google.com/support/chrome/";
-#endif
-
-// The URL to be opened when the Help link on the Autofill dialog is clicked.
-const char kAutofillHelpUrl[] =
-#if defined(OS_CHROMEOS)
-    "https://www.google.com/support/chromeos/bin/answer.py?answer=142893";
-#else
-    "https://www.google.com/support/chrome/bin/answer.py?answer=142893";
-#endif
-
 // The URL to be loaded to display the "Report a broken page" form.
 const char kBrokenPageUrl[] =
     "https://www.google.com/support/chrome/bin/request.py?contact_type="
@@ -2329,9 +2308,7 @@ void Browser::OpenUpdateChromeDialog() {
 
 void Browser::ShowHelpTab() {
   content::RecordAction(UserMetricsAction("ShowHelpTab"));
-  GURL help_url(kHelpContentUrl);
-  GURL localized_help_url = google_util::AppendGoogleLocaleParam(help_url);
-  ShowSingletonTab(localized_help_url);
+  ShowSingletonTab(GURL(chrome::kChromeHelpURL));
 }
 
 void Browser::OpenPrivacyDashboardTabAndActivate() {
@@ -2342,8 +2319,8 @@ void Browser::OpenPrivacyDashboardTabAndActivate() {
 }
 
 void Browser::OpenAutofillHelpTabAndActivate() {
-  GURL help_url = google_util::AppendGoogleLocaleParam(GURL(kAutofillHelpUrl));
-  AddSelectedTabWithURL(help_url, content::PAGE_TRANSITION_LINK);
+  AddSelectedTabWithURL(GURL(chrome::kAutofillHelpURL),
+                        content::PAGE_TRANSITION_LINK);
 }
 
 void Browser::OpenSearchEngineOptionsDialog() {
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 5c14a44..627ec8a 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -15,7 +15,6 @@
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
@@ -1711,11 +1710,9 @@ enum {
     SadTabController* sad_tab = static_cast<SadTabController*>(sender);
     WebContents* web_contents = [sad_tab webContents];
     if (web_contents) {
-      GURL helpUrl =
-          google_util::AppendGoogleLocaleParam(GURL(chrome::kCrashReasonURL));
       OpenURLParams params(
-          helpUrl, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_LINK,
-          false);
+          GURL(chrome::kCrashReasonURL), Referrer(), CURRENT_TAB,
+          content::PAGE_TRANSITION_LINK, false);
       web_contents->OpenURL(params);
     }
   }
diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm
index 2c1c0c8..d061b42 100644
--- a/chrome/browser/ui/cocoa/first_run_dialog.mm
+++ b/chrome/browser/ui/cocoa/first_run_dialog.mm
@@ -13,7 +13,6 @@
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/first_run/first_run_dialog.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -280,9 +279,7 @@ void ShowFirstRunDialog(Profile* profile) {
 }
 
 - (IBAction)learnMore:(id)sender {
-  GURL url = google_util::AppendGoogleLocaleParam(
-      GURL(chrome::kLearnMoreReportingURL));
-  NSString* urlStr = base::SysUTF8ToNSString(url.spec());;
+  NSString* urlStr = base::SysUTF8ToNSString(chrome::kLearnMoreReportingURL);
   NSURL* learnMoreUrl = [NSURL URLWithString:urlStr];
   [[NSWorkspace sharedWorkspace] openURL:learnMoreUrl];
 }
diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
index 39e0652..7a18b24 100644
--- a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,6 @@
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
@@ -213,12 +212,10 @@ void ShowPageInfoBubble(gfx::NativeWindow parent,
 }
 
 - (IBAction)showHelpPage:(id)sender {
-  GURL url = google_util::AppendGoogleLocaleParam(
-      GURL(chrome::kPageInfoHelpCenterURL));
   Browser* browser = BrowserList::GetLastActive();
   OpenURLParams params(
-      url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
-      false);
+      GURL(chrome::kPageInfoHelpCenterURL), Referrer(), NEW_FOREGROUND_TAB,
+      content::PAGE_TRANSITION_LINK, false);
   browser->OpenURL(params);
 }
 
diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc
index e8e93fa..f91b3d9 100644
--- a/chrome/browser/ui/gtk/first_run_dialog.cc
+++ b/chrome/browser/ui/gtk/first_run_dialog.cc
@@ -11,7 +11,6 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run_dialog.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/shell_integration.h"
@@ -204,8 +203,7 @@ void FirstRunDialog::OnResponseDialog(GtkWidget* widget, int response) {
 }
 
 void FirstRunDialog::OnLearnMoreLinkClicked(GtkButton* button) {
-  platform_util::OpenExternal(google_util::AppendGoogleLocaleParam(
-      GURL(chrome::kLearnMoreReportingURL)));
+  platform_util::OpenExternal(GURL(chrome::kLearnMoreReportingURL));
 }
 
 void FirstRunDialog::FirstRunDone() {
diff --git a/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc b/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc
index 5683582f..adab41b 100644
--- a/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -75,7 +76,7 @@ void InstantConfirmDialogGtk::OnLinkButtonClicked(GtkWidget* button) {
   // We open a new browser window so the Options dialog doesn't get lost behind
   // other windows.
   Browser* browser = Browser::Create(profile_);
-  browser->AddSelectedTabWithURL(browser::InstantLearnMoreURL(),
+  browser->AddSelectedTabWithURL(GURL(chrome::kInstantLearnMoreURL),
                                  content::PAGE_TRANSITION_LINK);
   browser->window()->Show();
 }
diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
index 8a0cf6d..7896c2c 100644
--- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,7 +9,6 @@
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_model_observer.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -228,12 +227,10 @@ void PageInfoBubbleGtk::OnViewCertLinkClicked(GtkWidget* widget) {
 }
 
 void PageInfoBubbleGtk::OnHelpLinkClicked(GtkWidget* widget) {
-  GURL url = google_util::AppendGoogleLocaleParam(
-      GURL(chrome::kPageInfoHelpCenterURL));
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   browser->OpenURL(OpenURLParams(
-      url, content::Referrer(), NEW_FOREGROUND_TAB,
-      content::PAGE_TRANSITION_LINK, false));
+      GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(),
+      NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
   bubble_->Close();
 }
 
diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc
index 202a502..f2a26d5 100644
--- a/chrome/browser/ui/gtk/sad_tab_gtk.cc
+++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc
@@ -1,11 +1,10 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/gtk/sad_tab_gtk.h"
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
@@ -158,13 +157,11 @@ SadTabGtk::~SadTabGtk() {
 
 void SadTabGtk::OnLinkButtonClick(GtkWidget* sender) {
   if (web_contents_ != NULL) {
-    GURL help_url =
-        google_util::AppendGoogleLocaleParam(GURL(
-            kind_ == CRASHED ?
-            chrome::kCrashReasonURL :
-            chrome::kKillReasonURL));
-    web_contents_->OpenURL(OpenURLParams(
+    GURL help_url(
+        kind_ == CRASHED ? chrome::kCrashReasonURL : chrome::kKillReasonURL);
+    OpenURLParams params(
         help_url, content::Referrer(), CURRENT_TAB,
-        content::PAGE_TRANSITION_LINK, false));
+        content::PAGE_TRANSITION_LINK, false);
+    web_contents_->OpenURL(params);
   }
 }
diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc
index 414b303..f1e2a0b 100644
--- a/chrome/browser/ui/views/instant_confirm_view.cc
+++ b/chrome/browser/ui/views/instant_confirm_view.cc
@@ -10,6 +10,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/url_constants.h"
+#include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -84,7 +86,7 @@ ui::ModalType InstantConfirmView::GetModalType() const {
 void InstantConfirmView::LinkClicked(views::Link* source, int event_flags) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   OpenURLParams params(
-      browser::InstantLearnMoreURL(), Referrer(), NEW_FOREGROUND_TAB,
+      GURL(chrome::kInstantLearnMoreURL), Referrer(), NEW_FOREGROUND_TAB,
       content::PAGE_TRANSITION_TYPED, false);
   browser->OpenURL(params);
 }
diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc
index b30aa12..b708a17 100644
--- a/chrome/browser/ui/views/page_info_bubble_view.cc
+++ b/chrome/browser/ui/views/page_info_bubble_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,7 +8,6 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
@@ -308,11 +307,10 @@ gfx::Rect PageInfoBubbleView::GetAnchorRect() {
 }
 
 void PageInfoBubbleView::LinkClicked(views::Link* source, int event_flags) {
-  GURL url = google_util::AppendGoogleLocaleParam(
-      GURL(chrome::kPageInfoHelpCenterURL));
   Browser* browser = BrowserList::GetLastActive();
   OpenURLParams params(
-      url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false);
+      GURL(chrome::kPageInfoHelpCenterURL), Referrer(), NEW_FOREGROUND_TAB,
+      content::PAGE_TRANSITION_LINK, false);
   browser->OpenURL(params);
   // NOTE: The bubble closes automatically on deactivation as the link opens.
 }
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index cfa8501..6c347d0 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -9,7 +9,6 @@
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/feedback/feedback_util.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/common/url_constants.h"
@@ -72,16 +71,12 @@ SadTabView::~SadTabView() {}
 void SadTabView::LinkClicked(views::Link* source, int event_flags) {
   DCHECK(web_contents_);
   if (source == help_link_) {
-    GURL help_url =
-        google_util::AppendGoogleLocaleParam(GURL(kind_ == CRASHED ?
-                                                  chrome::kCrashReasonURL :
-                                                  chrome::kKillReasonURL));
-    web_contents_->OpenURL(OpenURLParams(
-        help_url,
-        content::Referrer(),
-        CURRENT_TAB,
-        content::PAGE_TRANSITION_LINK,
-        false /* is renderer initiated */));
+    GURL help_url(
+        kind_ == CRASHED ? chrome::kCrashReasonURL : chrome::kKillReasonURL);
+    OpenURLParams params(
+        help_url, content::Referrer(), CURRENT_TAB,
+        content::PAGE_TRANSITION_LINK, false);
+    web_contents_->OpenURL(params);
   } else if (source == feedback_link_) {
     browser::ShowHtmlFeedbackView(
         Browser::GetBrowserForController(&web_contents_->GetController(), NULL),
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
index 8b95675..76ff9ae 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
@@ -12,7 +12,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -253,8 +252,7 @@ void NTPLoginHandler::GetLocalizedValues(Profile* profile,
   values->SetString("login_status_message",
       l10n_util::GetStringFUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_MESSAGE,
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
-  values->SetString("login_status_url",
-      google_util::StringAppendGoogleLocaleParam(chrome::kSyncLearnMoreURL));
+  values->SetString("login_status_url", chrome::kSyncLearnMoreURL);
   values->SetString("login_status_learn_more",
       l10n_util::GetStringUTF16(IDS_LEARN_MORE));
   values->SetString("login_status_advanced",
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc
index f68e028..48be3fa 100644
--- a/chrome/browser/ui/webui/options/advanced_options_handler.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/download/download_prefs.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
@@ -183,13 +182,11 @@ void AdvancedOptionsHandler::GetLocalizedValues(
                 IDS_OPTIONS_ADVANCED_TAB_LABEL);
 
   localized_strings->SetString("privacyLearnMoreURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kPrivacyLearnMoreURL)).spec());
+                               chrome::kPrivacyLearnMoreURL);
 
 #if defined(OS_CHROMEOS)
   localized_strings->SetString("cloudPrintLearnMoreURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kCloudPrintLearnMoreURL)).spec());
+                               chrome::kCloudPrintLearnMoreURL);
 #endif
 }
 
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index f5f7037..f16726c 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -22,6 +22,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/guid.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "grit/webkit_resources.h"
@@ -293,6 +294,7 @@ void AutofillOptionsHandler::GetLocalizedValues(
   RegisterTitle(localized_strings, "autofillOptionsPage",
                 IDS_AUTOFILL_OPTIONS_TITLE);
 
+  localized_strings->SetString("helpUrl", chrome::kAutofillHelpURL);
   SetAddressOverlayStrings(localized_strings);
   SetCreditCardOverlayStrings(localized_strings);
 }
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 3e08d34..dfebc3c 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -96,7 +96,7 @@ void BrowserOptionsHandler::GetLocalizedValues(
                 IDS_OPTIONS_GENERAL_TAB_LABEL);
 
   localized_strings->SetString("instantLearnMoreLink",
-      ASCIIToUTF16(browser::InstantLearnMoreURL().spec()));
+      ASCIIToUTF16(chrome::kInstantLearnMoreURL));
   localized_strings->SetString("defaultBrowserUnknown",
       l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index 7949a63..b88302b 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,7 +13,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -88,8 +87,7 @@ void CoreOptionsHandler::GetStaticLocalizedValues(
       l10n_util::GetStringFUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_TITLE,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings->SetString("searchPageHelpURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kChromeHelpURL)).spec());
+                               chrome::kSettingsSearchHelpURL);
 
   // Common
   localized_strings->SetString("ok",
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc
index 9ccdde8..f1bbc90 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/password_manager_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,7 +8,6 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -72,8 +71,7 @@ void PasswordManagerHandler::GetLocalizedValues(
                 IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE);
 
   localized_strings->SetString("passwordManagerLearnMoreURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kPasswordManagerLearnMoreURL)).spec());
+                               chrome::kPasswordManagerLearnMoreURL);
 }
 
 void PasswordManagerHandler::Initialize() {
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index 9442a23..edad603 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -17,7 +17,6 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
@@ -88,8 +87,7 @@ void PersonalOptionsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_SYNC_OPTIONS_GROUP_NAME));
   localized_strings->SetString("customizeSync",
       l10n_util::GetStringUTF16(IDS_SYNC_CUSTOMIZE_BUTTON_LABEL));
-  localized_strings->SetString("syncLearnMoreURL",
-      google_util::StringAppendGoogleLocaleParam(chrome::kSyncLearnMoreURL));
+  localized_strings->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
 
   localized_strings->SetString("profiles",
       l10n_util::GetStringUTF16(IDS_PROFILES_OPTIONS_GROUP_NAME));
diff --git a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc b/chrome/browser/ui/webui/options2/advanced_options_handler2.cc
index d93787e..29fa32d 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/advanced_options_handler2.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/download/download_prefs.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
@@ -224,8 +223,7 @@ void AdvancedOptionsHandler::GetLocalizedValues(
                 IDS_OPTIONS2_ADVANCED_TAB_LABEL);
 
   localized_strings->SetString("privacyLearnMoreURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kPrivacyLearnMoreURL)).spec());
+                               chrome::kPrivacyLearnMoreURL);
 
   localized_strings->SetString(
       "languageSectionLabel",
@@ -235,8 +233,7 @@ void AdvancedOptionsHandler::GetLocalizedValues(
 
 #if defined(OS_CHROMEOS)
   localized_strings->SetString("cloudPrintLearnMoreURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kCloudPrintLearnMoreURL)).spec());
+                               chrome::kCloudPrintLearnMoreURL);
 
   // TODO(pastarmovj): replace this with a call to the CrosSettings list
   // handling functionality to come.
diff --git a/chrome/browser/ui/webui/options2/autofill_options_handler2.cc b/chrome/browser/ui/webui/options2/autofill_options_handler2.cc
index feda2cf..6c92a0d 100644
--- a/chrome/browser/ui/webui/options2/autofill_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/autofill_options_handler2.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -22,6 +22,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/guid.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "grit/webkit_resources.h"
@@ -295,6 +296,7 @@ void AutofillOptionsHandler::GetLocalizedValues(
   RegisterTitle(localized_strings, "autofillOptionsPage",
                 IDS_AUTOFILL_OPTIONS_TITLE);
 
+  localized_strings->SetString("helpUrl", chrome::kAutofillHelpURL);
   SetAddressOverlayStrings(localized_strings);
   SetCreditCardOverlayStrings(localized_strings);
 }
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
index 7f02994..fb34661 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_field_trial.h"
@@ -186,25 +185,21 @@ void BrowserOptionsHandler::GetLocalizedValues(
       l10n_util::GetStringFUTF16(IDS_SYNC_OVERVIEW,
                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
-  localized_strings->SetString(
-      "syncLearnMoreURL",
-      google_util::StringAppendGoogleLocaleParam(chrome::kSyncLearnMoreURL));
+  localized_strings->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
   localized_strings->SetString(
       "profilesSingleUser",
       l10n_util::GetStringFUTF16(IDS_PROFILES_SINGLE_USER_MESSAGE,
                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
+  string16 learn_more_url = ASCIIToUTF16(chrome::kInstantLearnMoreURL);
   localized_strings->SetString(
       "defaultSearchGroupLabel",
-      l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION,
-          l10n_util::GetStringUTF16(IDS_OMNIBOX_LEARN_MORE_URL)));
+      l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, learn_more_url));
   localized_strings->SetString(
       "instantPrefAndWarning",
       l10n_util::GetStringFUTF16(IDS_INSTANT_PREF_WITH_WARNING,
-          l10n_util::GetStringUTF16(IDS_INSTANT_LEARN_MORE_URL)));
-  localized_strings->SetString(
-      "instantLearnMoreLink",
-      ASCIIToUTF16(browser::InstantLearnMoreURL().spec()));
+                                 learn_more_url));
+  localized_strings->SetString("instantLearnMoreLink", learn_more_url);
 
   localized_strings->SetString(
       "defaultBrowserUnknown",
diff --git a/chrome/browser/ui/webui/options2/core_options_handler2.cc b/chrome/browser/ui/webui/options2/core_options_handler2.cc
index 85cebdd..7389e52 100644
--- a/chrome/browser/ui/webui/options2/core_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/core_options_handler2.cc
@@ -13,7 +13,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -90,8 +89,7 @@ void CoreOptionsHandler::GetStaticLocalizedValues(
       l10n_util::GetStringFUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_TITLE,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings->SetString("searchPageHelpURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kChromeHelpURL)).spec());
+                               chrome::kSettingsSearchHelpURL);
 
   // Common
   localized_strings->SetString("ok",
diff --git a/chrome/browser/ui/webui/options2/password_manager_handler2.cc b/chrome/browser/ui/webui/options2/password_manager_handler2.cc
index 870a23d..bf5ccd5 100644
--- a/chrome/browser/ui/webui/options2/password_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/password_manager_handler2.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,7 +8,6 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -74,8 +73,7 @@ void PasswordManagerHandler::GetLocalizedValues(
                 IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE);
 
   localized_strings->SetString("passwordManagerLearnMoreURL",
-      google_util::AppendGoogleLocaleParam(
-          GURL(chrome::kPasswordManagerLearnMoreURL)).spec());
+                               chrome::kPasswordManagerLearnMoreURL);
 }
 
 void PasswordManagerHandler::Initialize() {
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 6eef3b9..a5b3faf 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -196,13 +196,9 @@ void SyncSetupHandler::GetStaticLocalizedValues(
   DCHECK(localized_strings);
 
   localized_strings->SetString(
-      "invalidPasswordHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kInvalidPasswordHelpURL));
+      "invalidPasswordHelpURL", chrome::kInvalidPasswordHelpURL);
   localized_strings->SetString(
-      "cannotAccessAccountURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kCanNotAccessAccountURL));
+      "cannotAccessAccountURL", chrome::kCanNotAccessAccountURL);
   string16 product_name(GetStringUTF16(IDS_PRODUCT_NAME));
   localized_strings->SetString(
       "introduction",
@@ -214,9 +210,7 @@ void SyncSetupHandler::GetStaticLocalizedValues(
       "encryptionInstructions",
       GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS, product_name));
   localized_strings->SetString(
-      "encryptionHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncEncryptionHelpURL));
+      "encryptionHelpURL", chrome::kSyncEncryptionHelpURL);
   localized_strings->SetString(
       "passphraseEncryptionMessage",
       GetStringFUTF16(IDS_SYNC_PASSPHRASE_ENCRYPTION_MESSAGE, product_name));
@@ -238,13 +232,9 @@ void SyncSetupHandler::GetStaticLocalizedValues(
       "promoMessageTitle",
       GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, short_product_name));
   localized_strings->SetString(
-      "syncEverythingHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncEverythingLearnMoreURL));
+      "syncEverythingHelpURL", chrome::kSyncEverythingLearnMoreURL);
   localized_strings->SetString(
-      "syncErrorHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncErrorsHelpURL));
+      "syncErrorHelpURL", chrome::kSyncErrorsHelpURL);
 
   std::string create_account_url = google_util::StringAppendGoogleLocaleParam(
       chrome::kSyncCreateNewAccountURL);
diff --git a/chrome/browser/ui/webui/sync_setup_handler2.cc b/chrome/browser/ui/webui/sync_setup_handler2.cc
index 275556f..d57a1a5 100644
--- a/chrome/browser/ui/webui/sync_setup_handler2.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler2.cc
@@ -200,13 +200,9 @@ void SyncSetupHandler2::GetStaticLocalizedValues(
   DCHECK(localized_strings);
 
   localized_strings->SetString(
-      "invalidPasswordHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kInvalidPasswordHelpURL));
+      "invalidPasswordHelpURL", chrome::kInvalidPasswordHelpURL);
   localized_strings->SetString(
-      "cannotAccessAccountURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kCanNotAccessAccountURL));
+      "cannotAccessAccountURL", chrome::kCanNotAccessAccountURL);
   string16 product_name(GetStringUTF16(IDS_PRODUCT_NAME));
   localized_strings->SetString(
       "introduction",
@@ -218,9 +214,7 @@ void SyncSetupHandler2::GetStaticLocalizedValues(
       "encryptionInstructions",
       GetStringFUTF16(IDS_SYNC_ENCRYPTION_INSTRUCTIONS, product_name));
   localized_strings->SetString(
-      "encryptionHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncEncryptionHelpURL));
+      "encryptionHelpURL", chrome::kSyncEncryptionHelpURL);
   localized_strings->SetString(
       "passphraseEncryptionMessage",
       GetStringFUTF16(IDS_SYNC_PASSPHRASE_ENCRYPTION_MESSAGE, product_name));
@@ -242,13 +236,9 @@ void SyncSetupHandler2::GetStaticLocalizedValues(
       "promoMessageTitle",
       GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, short_product_name));
   localized_strings->SetString(
-      "syncEverythingHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncEverythingLearnMoreURL));
+      "syncEverythingHelpURL", chrome::kSyncEverythingLearnMoreURL);
   localized_strings->SetString(
-      "syncErrorHelpURL",
-      google_util::StringAppendGoogleLocaleParam(
-          chrome::kSyncErrorsHelpURL));
+      "syncErrorHelpURL", chrome::kSyncErrorsHelpURL);
 
   std::string create_account_url = google_util::StringAppendGoogleLocaleParam(
       chrome::kSyncCreateNewAccountURL);
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 7d860d1..177f4cc 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -276,88 +276,126 @@ const char kSyncGoogleDashboardURL[] = "https://www.google.com/dashboard/";
 
 const char kPasswordManagerLearnMoreURL[] =
 #if defined(OS_CHROMEOS)
-    "https://www.google.com/support/chromeos/bin/answer.py?answer=95606";
+    "https://support.google.com/chromeos/?p=settings_password";
 #else
-    "https://www.google.com/support/chrome/bin/answer.py?answer=95606";
+    "https://support.google.com/chrome/?p=settings_password";
 #endif
 
 const char kChromeHelpURL[] =
 #if defined(OS_CHROMEOS)
-  "https://www.google.com/support/chromeos/";
+#if defined(OFFICIAL_BUILD)
+    "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html";
 #else
-  "https://www.google.com/support/chrome/";
+    "https://support.google.com/chromeos/?p=wrench";
+#endif  // defined(OFFICIAL_BUILD
+#else
+    "https://support.google.com/chrome/?p=wrench";
+#endif
+
+const char kSettingsSearchHelpURL[] =
+#if defined(OS_CHROMEOS)
+    "https://support.google.com/chromeos/?p=settings_search_help";
+#else
+    "https://support.google.com/chrome/?p=settings_search_help";
+#endif
+
+const char kAboutGoogleTranslateURL[] =
+#if defined(OS_CHROMEOS)
+    "https://support.google.com/chromeos/?p=ib_translation_bar";
+#else
+    "https://support.google.com/chrome/?p=ib_translation_bar";
+#endif
+
+const char kAutofillHelpURL[] =
+#if defined(OS_CHROMEOS)
+    "https://support.google.com/chromeos/?p=settings_autofill";
+#else
+    "https://support.google.com/chrome/?p=settings_autofill";
+#endif
+
+const char kInstantLearnMoreURL[] =
+#if defined(OS_CHROMEOS)
+    "https://support.google.com/chromeos/?p=settings_instant_policy";
+#else
+    "https://support.google.com/chrome/?p=settings_instant_policy";
 #endif
 
 const char kPageInfoHelpCenterURL[] =
 #if defined(OS_CHROMEOS)
-    "https://www.google.com/support/chromeos/bin/answer.py?answer=95617";
+    "https://support.google.com/chromeos/?p=ui_security_indicator";
 #else
-    "https://www.google.com/support/chrome/bin/answer.py?answer=95617";
+    "https://support.google.com/chrome/?p=ui_security_indicator";
 #endif
 
 const char kCrashReasonURL[] =
 #if defined(OS_CHROMEOS)
-    "https://www.google.com/support/chromeos/bin/answer.py?answer=1047340";
+    "https://support.google.com/chromeos/?p=e_awsnap";
 #else
-    "https://www.google.com/support/chrome/bin/answer.py?answer=95669";
+    "https://support.google.com/chrome/?p=e_awsnap";
 #endif
 
 const char kKillReasonURL[] =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=1270364";
+#if defined(OS_CHROMEOS)
+    "https://support.google.com/chromeos/?p=e_deadjim";
+#else
+    "https://support.google.com/chrome/?p=e_deadjim";
+#endif
 
 const char kPrivacyLearnMoreURL[] =
 #if defined(OS_CHROMEOS)
-    "https://www.google.com/support/chromeos/bin/answer.py?answer=1047334";
+    "https://support.google.com/chromeos/?p=settings_privacy";
 #else
-    "https://www.google.com/support/chrome/bin/answer.py?answer=114836";
+    "https://support.google.com/chrome/?p=settings_privacy";
 #endif
 
 const char kChromiumProjectURL[] = "http://code.google.com/chromium/";
 
 const char kLearnMoreReportingURL[] =
-    "https://www.google.com/support/chrome/bin/answer.py?answer=96817";
+    "https://support.google.com/chrome/?p=ui_usagestat";
 
 const char kOutdatedPluginLearnMoreURL[] =
-    "https://www.google.com/support/chrome/bin/answer.py?answer=1181003";
+    "https://support.google.com/chrome/?p=ib_outdated_plugin";
 
 const char kBlockedPluginLearnMoreURL[] =
-    "https://www.google.com/support/chrome/bin/answer.py?answer=1247383";
+    "https://support.google.com/chrome/?p=ib_blocked_plugin";
 
 const char kSpeechInputAboutURL[] =
-    "https://www.google.com/support/chrome/bin/answer.py?answer=1407892";
+    "https://support.google.com/chrome/?p=ui_speech_input";
 
 const char kLearnMoreRegisterProtocolHandlerURL[] =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=1382847";
+    "https://support.google.com/chrome/?p=ib_protocol_handler";
 
 const char kSyncLearnMoreURL[] =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=165139";
+    "https://support.google.com/chrome/?p=settings_sign_in";
 
 const char kDownloadScanningLearnMoreURL[] =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=99020";
+    "https://support.google.com/chrome/?p=ib_download_scan";
 
 const char kSyncEverythingLearnMoreURL[] =
-    "https://www.google.com/support/chrome/bin/answer.py?answer=185277";
+    "https://support.google.com/chrome/?p=settings_sync_all";
 
-#if defined(OS_CHROMEOS)
 const char kCloudPrintLearnMoreURL[] =
-    "https://www.google.com/support/chromeos/bin/topic.py?topic=29023";
+#if defined(OS_CHROMEOS)
+    "https://support.google.com/chromeos/?p=settings_cloud_print";
+#else
+    "https://support.google.com/chrome/?p=settings_cloud_print";
 #endif
 
 const char kInvalidPasswordHelpURL[] =
-    "http://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
+    "https://support.google.com/accounts/bin/answer.py?ctx=ch&answer=27444";
 
 const char kCanNotAccessAccountURL[] =
-    "http://www.google.com/support/accounts/bin/answer.py?answer=48598";
+    "https://support.google.com/accounts/bin/answer.py?answer=48598";
 
 const char kSyncEncryptionHelpURL[] =
 #if defined(OS_CHROMEOS)
-    "http://www.google.com/support/chromeos/bin/answer.py?answer=1181035";
+    "https://support.google.com/chromeos/?p=settings_encryption";
 #else
-    "http://www.google.com/support/chrome/bin/answer.py?answer=1181035";
+    "https://support.google.com/chrome/?p=settings_encryption";
 #endif
 
 const char kSyncErrorsHelpURL[] =
-  "http://www.google.com/support/chrome/bin/answer.py?answer=1181420";
+    "https://support.google.com/chrome/?p=settings_sync_error";
 
 const char kSyncCreateNewAccountURL[] =
     "https://www.google.com/accounts/NewAccount?service=chromiumsync";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index f11abc0..bfad3c9 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -264,6 +264,18 @@ extern const char kPasswordManagerLearnMoreURL[];
 // General help link for Chrome.
 extern const char kChromeHelpURL[];
 
+// Help URL for the settings page's search feature.
+extern const char kSettingsSearchHelpURL[];
+
+// "About" URL for the translate bar's options menu.
+extern const char kAboutGoogleTranslateURL[];
+
+// Help URL for the Autofill dialog.
+extern const char kAutofillHelpURL[];
+
+// "Learn more" URL for the Instant feature.
+extern const char kInstantLearnMoreURL[];
+
 // "What do these mean?" URL for the Page Info bubble.
 extern const char kPageInfoHelpCenterURL[];