Avoid abs() of unsigned values.

base/mime_util_xdg.cc

 // Copyright (c) 2011 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 "base/mime_util.h"
 
 #include <gtk/gtk.h>
 #include <sys/time.h>
 #include <time.h>
 
@@ skipping 180 matching lines @@
        subdir_iter != subdirs_.end();
        ++subdir_iter) {
     SubDirInfo* info = &info_array_[subdir_iter->second];
     if (MatchesSize(info, size) == 0) {
       icon_path = GetIconPathUnderSubdir(icon_name, subdir_iter->first);
       if (!icon_path.empty())
         return icon_path;
     }
   }
   // Now looking for the mostly matched.
-  int min_delta_seen = 9999;
+  size_t min_delta_seen = 9999;
 
   for (subdir_iter = subdirs_.begin();
        subdir_iter != subdirs_.end();
        ++subdir_iter) {
     SubDirInfo* info = &info_array_[subdir_iter->second];
-    int delta = abs(MatchesSize(info, size));
+    size_t delta = MatchesSize(info, size);
     if (delta < min_delta_seen) {
       FilePath path = GetIconPathUnderSubdir(icon_name, subdir_iter->first);
       if (!path.empty()) {
         min_delta_seen = delta;
         icon_path = path;
       }
     }
   }
 
   if (!icon_path.empty() || !inherits || inherits_ == "")
@@ skipping 100 matching lines @@
       }
     }
   }
 
   file_util::CloseFile(fp);
   return info_array_ != NULL;
 }
 
 size_t IconTheme::MatchesSize(SubDirInfo* info, size_t size) {
   if (info->type == SubDirInfo::Fixed) {
-    return size - info->size;
+    if (size > info->size)
+      return size - info->size;
+    else
+      return info->size - size;
   } else if (info->type == SubDirInfo::Scalable) {
-    if (size >= info->min_size && size <= info->max_size) {
-      return 0;
-    } else {
-      return abs(size - info->min_size) < abs(size - info->max_size) ?
-          (size - info->min_size) : (size - info->max_size);
-    }
+    if (size < info->min_size)
+      return info->min_size - size;
+    if (size > info->max_size)
+      return size - info->max_size;
+    return 0;
   } else {
-    if (size >= info->size - info->threshold &&
-        size <= info->size + info->threshold) {
-      return 0;
-    } else {
-      return abs(size - info->size - info->threshold) <
-          abs(size - info->size + info->threshold)
-          ? size - info->size - info->threshold
-          : size - info->size + info->threshold;
-    }
+    if (size + info->threshold < info->size)
+      return info->size - size - info->threshold;
+    if (size > info->size + info->threshold)
+      return size - info->size - info->threshold;
+    return 0;
   }
 }
 
 std::string IconTheme::ReadLine(FILE* fp) {
   if (!fp)
     return "";
 
   std::string result = "";
   const size_t kBufferSize = 100;
   char buffer[kBufferSize];
@@ skipping 274 matching lines @@
     } else {
       icon_file = LookupIconInDefaultTheme(icon_names[i], size);
       if (!icon_file.empty())
         return icon_file;
     }
   }
   return FilePath();
 }
 
 }  // namespace mime_util