Cleanup: Remove unused constant kLanguageSettingsLearnMoreUrl for non-CrOS.

Also doing the same for kEasyUnlockLearnMoreUrl, which is only used in CrOS.

Bug: 621723
Change-Id: Ieada2f363c886e9321016de45a2157a3d35ac1fb
Reviewed-on: https://chromium-review.googlesource.com/1053155
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557728}

chrome/common/url_constants.cc

@@ -126,9 +126,6 @@ const char kDownloadInterruptedLearnMoreURL[] =
 const char kDownloadScanningLearnMoreURL[] =
     "https://support.google.com/chrome/?p=ib_download_blocked";
 
-const char kEasyUnlockLearnMoreUrl[] =
-    "https://support.google.com/chromebook/?p=smart_lock";
-
 const char kExtensionControlledSettingLearnMoreURL[] =
     "https://support.google.com/chrome/?p=ui_settings_api_extension";
 
@@ -137,13 +134,6 @@ const char kExtensionInvalidRequestURL[] = "chrome-extension://invalid/";
 const char kGoogleAccountActivityControlsURL[] =
     "https://myaccount.google.com/activitycontrols/search";
 
-const char kLanguageSettingsLearnMoreUrl[] =
-#if defined(OS_CHROMEOS)
-    "https://support.google.com/chromebook/answer/1059490";
-#else
-    "https://support.google.com/chrome/topic/1678461";
-#endif
-
 const char kLearnMoreReportingURL[] =
     "https://support.google.com/chrome/?p=ui_usagestat";
 
@@ -257,6 +247,9 @@ const char kCrosScheme[] = "cros";
 const char kCupsPrintLearnMoreURL[] =
     "https://support.google.com/chromebook?p=chromebook_printing";
 
+const char kEasyUnlockLearnMoreUrl[] =
+    "https://support.google.com/chromebook/?p=smart_lock";
+
 const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html";
 
 const char kEolNotificationURL[] = "https://www.google.com/chromebook/older/";
@@ -267,6 +260,9 @@ const char kGoogleNameserversLearnMoreURL[] =
 const char kInstantTetheringLearnMoreURL[] =
     "https://support.google.com/chromebook?p=instant_tethering";
 
+const char kLanguageSettingsLearnMoreUrl[] =
+    "https://support.google.com/chromebook/answer/1059490";
+
 const char kLearnMoreEnterpriseURL[] =
     "https://support.google.com/chromebook/?p=managed";
 

chrome/common/url_constants.h

@@ -107,10 +107,6 @@ extern const char kDownloadInterruptedLearnMoreURL[];
 // The URL for the "Learn more" page for download scanning.
 extern const char kDownloadScanningLearnMoreURL[];
 
-// The URL for the "Learn more" link the the Easy Unlock settings.
-// TODO(thestig): Move into OS_CHROMEOS section.
-extern const char kEasyUnlockLearnMoreUrl[];
-
 // "Learn more" URL for the Settings API, NTP bubble and other settings bubbles
 // showing which extension is controlling them.
 extern const char kExtensionControlledSettingLearnMoreURL[];
@@ -121,10 +117,6 @@ extern const char kExtensionInvalidRequestURL[];
 // URL of the 'Activity controls' section of the privacy settings page.
 extern const char kGoogleAccountActivityControlsURL[];
 
-// The URL for the "Learn more" link in the language settings.
-// TODO(michaelpg): Compile on Chrome OS only when Options is removed.
-extern const char kLanguageSettingsLearnMoreUrl[];
-
 // The URL for the "Learn more" page for the usage/crash reporting option in the
 // first run dialog.
 extern const char kLearnMoreReportingURL[];
@@ -206,6 +198,9 @@ extern const char kCrosScheme[];
 
 extern const char kCupsPrintLearnMoreURL[];
 
+// The URL for the "Learn more" link the the Easy Unlock settings.
+extern const char kEasyUnlockLearnMoreUrl[];
+
 extern const char kEULAPathFormat[];
 
 // The URL for EOL notification
@@ -217,6 +212,9 @@ extern const char kGoogleNameserversLearnMoreURL[];
 // The URL for the "learn more" link for Instant Tethering.
 extern const char kInstantTetheringLearnMoreURL[];
 
+// The URL for the "Learn more" link in the language settings.
+extern const char kLanguageSettingsLearnMoreUrl[];
+
 // The URL for the Learn More page about enterprise enrolled devices.
 extern const char kLearnMoreEnterpriseURL[];