clang/win: Fix most -Wunused-function warnings in Chromium code.

No intended behavior change.

BUG=505316
TBR=armansito

Review URL: https://codereview.chromium.org/1255073002

Cr-Commit-Position: refs/heads/master@{#340761}

3 files changed, 2 insertions, 23 deletions

diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index 2a7c06c8..d99f6e5 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -182,6 +182,7 @@ bool GetChromeChannelInternal(bool system_install,
   return true;
 }
 
+#if defined(GOOGLE_CHROME_BUILD)
 // Populates |update_policy| with the UpdatePolicy enum value corresponding to a
 // DWORD read from the registry and returns true if |value| is within range.
 // If |value| is out of range, returns false without modifying |update_policy|.
@@ -200,6 +201,7 @@ bool GetUpdatePolicyFromDword(
   }
   return false;
 }
+#endif  // defined(GOOGLE_CHROME_BUILD)
 
 // Convenience routine: GoogleUpdateSettings::UpdateDidRunStateForApp()
 // specialized for Chrome Binaries.
diff --git a/chrome/installer/util/language_selector.cc b/chrome/installer/util/language_selector.cc
index a29ec1f..1c1a582 100644
--- a/chrome/installer/util/language_selector.cc
+++ b/chrome/installer/util/language_selector.cc
@@ -124,17 +124,6 @@ bool operator<(const LangToOffset& left, const std::wstring& right) {
   return left.language < right;
 }
 
-// A less-than overload to do slightly more efficient searches in the
-// sorted arrays.
-bool operator<(const std::wstring& left, const LangToOffset& right) {
-  return left < right.language;
-}
-
-// A not-so-efficient less-than overload for the same uses as above.
-bool operator<(const LangToOffset& left, const LangToOffset& right) {
-  return std::wstring(left.language) < right.language;
-}
-
 // A compare function for searching in a sorted array by offset.
 bool IsOffsetLessThan(const LangToOffset& left, const LangToOffset& right) {
   return left.offset < right.offset;
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 531f19e..30f558d 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -921,18 +921,6 @@ bool LaunchSelectDefaultProtocolHandlerDialog(const wchar_t* protocol) {
   return true;
 }
 
-// Launches the Windows 7 and Windows 8 application association dialog, which
-// is the only documented way to make a browser the default browser on
-// Windows 8.
-bool LaunchApplicationAssociationDialog(const base::string16& app_id) {
-  base::win::ScopedComPtr<IApplicationAssociationRegistrationUI> aarui;
-  HRESULT hr = aarui.CreateInstance(CLSID_ApplicationAssociationRegistrationUI);
-  if (FAILED(hr))
-    return false;
-  hr = aarui->LaunchAdvancedAssociationUI(app_id.c_str());
-  return SUCCEEDED(hr);
-}
-
 // Returns true if the current install's |chrome_exe| has been registered with
 // |suffix|.
 // |confirmation_level| is the level of verification desired as described in