Fix a bunch of clang warnings/errors.

chrome/browser/web_applications/web_app.cc

Index: chrome/browser/web_applications/web_app.cc
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index ae4bc687a1544b406e6f1b795e75e273ac942a07..99e004bec9744d67e689c051226d4d44ea1a0428 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -111,13 +111,16 @@ FilePath GetWebAppDataDirectory(const FilePath& root_dir,
   return root_dir.Append(GetWebAppDir(url));
 }
 
+#if defined(TOOLKIT_VIEWS)
 // Predicator for sorting images from largest to smallest.
 bool IconPrecedes(
     const webkit_glue::WebApplicationInfo::IconInfo& left,
     const webkit_glue::WebApplicationInfo::IconInfo& right) {
   return left.width < right.width;
 }
+#endif
 
+#if defined(OS_WIN)
 // Calculates image checksum using MD5.
 void GetImageCheckSum(const SkBitmap& image, MD5Digest* digest) {
   DCHECK(digest);
@@ -126,7 +129,6 @@ void GetImageCheckSum(const SkBitmap& image, MD5Digest* digest) {
   MD5Sum(image.getPixels(), image.getSize(), digest);
 }
 
-#if defined(OS_WIN)
 // Saves |image| as an |icon_file| with the checksum.
 bool SaveIconWithCheckSum(const FilePath& icon_file, const SkBitmap& image) {
   if (!IconUtil::CreateIconFileFromSkBitmap(image, icon_file))