Linux: Move base/mime_util* to base/nix. It's not used on any other platform.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8538008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109685 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc
index 20904b5..4879adf 100644
--- a/chrome/browser/icon_loader.cc
+++ b/chrome/browser/icon_loader.cc
@@ -9,7 +9,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "base/mime_util.h"
+#include "base/nix/mime_util_xdg.h"
 #endif
 
 using content::BrowserThread;
@@ -31,7 +31,7 @@ void IconLoader::Start() {
 
 #if defined(TOOLKIT_USES_GTK)
   // This call must happen on the UI thread before we can start loading icons.
-  mime_util::DetectGtkTheme();
+  base::nix::DetectGtkTheme();
 #endif
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc
index 0bb6879..a6cb519 100644
--- a/chrome/browser/icon_loader_linux.cc
+++ b/chrome/browser/icon_loader_linux.cc
@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/mime_util.h"
+#include "base/nix/mime_util_xdg.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/image_decoder.h"
 
@@ -31,7 +31,7 @@ void IconLoader::ReadIcon() {
       NOTREACHED();
   }
 
-  FilePath filename = mime_util::GetMimeIcon(group_, size_pixels);
+  FilePath filename = base::nix::GetMimeIcon(group_, size_pixels);
   string icon_data;
   file_util::ReadFileToString(filename, &icon_data);
 
diff --git a/chrome/browser/icon_manager_linux.cc b/chrome/browser/icon_manager_linux.cc
index fc3cfa8..df7c629 100644
--- a/chrome/browser/icon_manager_linux.cc
+++ b/chrome/browser/icon_manager_linux.cc
@@ -4,16 +4,16 @@
 
 #include "chrome/browser/icon_manager.h"
 
-#include "base/mime_util.h"
+#include "base/nix/mime_util_xdg.h"
 #include "base/threading/thread_restrictions.h"
 
 IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) {
-  // It turns out the call to mime_util::GetFileMimeType below does IO, but
+  // It turns out the call to base::nix::GetFileMimeType below does IO, but
   // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows
   // and Mac implementations do not). We should fix this by either not doing IO
   // in this method, or reworking callers to avoid calling it on the UI thread.
   // See crbug.com/72740.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-  return mime_util::GetFileMimeType(filepath);
+  return base::nix::GetFileMimeType(filepath);
 }
diff --git a/chrome/browser/ui/gtk/dialogs_gtk.cc b/chrome/browser/ui/gtk/dialogs_gtk.cc
index 6064705..b79a171 100644
--- a/chrome/browser/ui/gtk/dialogs_gtk.cc
+++ b/chrome/browser/ui/gtk/dialogs_gtk.cc
@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/mime_util.h"
+#include "base/nix/mime_util_xdg.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
@@ -228,7 +228,7 @@ void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {
 
         // Allow IO in the file dialog. http://crbug.com/72637
         base::ThreadRestrictions::ScopedAllowIO allow_io;
-        std::string mime_type = mime_util::GetFileMimeType(
+        std::string mime_type = base::nix::GetFileMimeType(
             FilePath("name").ReplaceExtension(file_types_.extensions[i][j]));
         gtk_file_filter_add_mime_type(filter, mime_type.c_str());
       }
@@ -247,7 +247,7 @@ void SelectFileDialogImplGTK::AddFilters(GtkFileChooser* chooser) {
       base::ThreadRestrictions::ScopedAllowIO allow_io;
       // There is no system default filter description so we use
       // the MIME type itself if the description is blank.
-      std::string mime_type = mime_util::GetFileMimeType(
+      std::string mime_type = base::nix::GetFileMimeType(
           FilePath("name").ReplaceExtension(file_types_.extensions[i][0]));
       gtk_file_filter_set_name(filter, mime_type.c_str());
     }
diff --git a/chrome/browser/ui/gtk/dialogs_kde.cc b/chrome/browser/ui/gtk/dialogs_kde.cc
index 8b6893e..c5a9e4d 100644
--- a/chrome/browser/ui/gtk/dialogs_kde.cc
+++ b/chrome/browser/ui/gtk/dialogs_kde.cc
@@ -11,7 +11,7 @@
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/mime_util.h"
+#include "base/nix/mime_util_xdg.h"
 #include "base/nix/xdg_util.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
@@ -194,7 +194,7 @@ std::string SelectFileDialogImplKDE::GetMimeTypeFilterString() {
   for (size_t i = 0; i < file_types_.extensions.size(); ++i) {
     for (size_t j = 0; j < file_types_.extensions[i].size(); ++j) {
       if (!file_types_.extensions[i][j].empty()) {
-        std::string mime_type = mime_util::GetFileMimeType(
+        std::string mime_type = base::nix::GetFileMimeType(
             FilePath("name").ReplaceExtension(file_types_.extensions[i][j]));
         filter_set.insert(mime_type);
       }