Clean up the IconLoader.

chrome/browser/icon_loader_win.cc

Index: chrome/browser/icon_loader_win.cc
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index 759088d34b9d6fabeaaae8b66ec221861883065d..cae14dcaa938ba438869efcffea160f76a6689e3 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -16,21 +16,24 @@
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image_skia.h"
 
-// static
-IconGroupID IconLoader::ReadGroupIDFromFilepath(
-    const base::FilePath& filepath) {
-  if (!IsIconMutableFromFilepath(filepath))
-    return filepath.Extension();
-  return filepath.value();
-}
+namespace {
 
-// static
-bool IconLoader::IsIconMutableFromFilepath(const base::FilePath& filepath) {
+bool IsInstanceIconForFilepath(const base::FilePath& filepath) {
   return filepath.MatchesExtension(L".exe") ||
          filepath.MatchesExtension(L".dll") ||
          filepath.MatchesExtension(L".ico");
 }
 
+}  // namespace
+
+// static
+IconLoader::IconGroup IconLoader::GroupForFilepath(
+    const base::FilePath& filepath) {
+  if (!IsInstanceIconForFilepath(filepath))
+    return filepath.Extension();
+  return filepath.value();
+}
+
 // static
 content::BrowserThread::ID IconLoader::ReadIconThreadID() {
   return content::BrowserThread::FILE;