Change mime type utils to operate on platform-specific string types for filenames/file extensions.

Review URL: http://codereview.chromium.org/21327

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

6 files changed, 22 insertions, 17 deletions

diff --git a/chrome/browser/debugger/debugger_contents.cc b/chrome/browser/debugger/debugger_contents.cc
index 1c426f8..2756244 100644
--- a/chrome/browser/debugger/debugger_contents.cc
+++ b/chrome/browser/debugger/debugger_contents.cc
@@ -69,7 +69,12 @@ class DebuggerHTMLSource : public ChromeURLDataManager::DataSource {
     // Currently but three choices {"", "debugger.js", "debugger.css"}.
     // Map the extension to mime-type, defaulting to "text/html".
     std::string mime_type("text/html");
-    net::GetMimeTypeFromFile(ASCIIToWide(path), &mime_type);
+#if defined(OS_WIN)
+    FilePath file_path(ASCIIToWide(path));
+#elif defined(OS_POSIX)
+    FilePath file_path(path);
+#endif
+    net::GetMimeTypeFromFile(file_path, &mime_type);
     return mime_type;
   }
 
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 5747c3b..965f2ed 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -1080,7 +1080,7 @@ void DownloadManager::GenerateExtension(
     extension.assign(default_extension);
 
   std::string mime_type_from_extension;
-  net::GetMimeTypeFromFile(file_name.ToWStringHack(),
+  net::GetMimeTypeFromFile(file_name,
                            &mime_type_from_extension);
   if (mime_type == mime_type_from_extension) {
     // The hinted extension matches the mime type.  It looks like a winner.
@@ -1198,11 +1198,11 @@ static const char* kExecutableBlackList[] = {
 
 // static
 bool DownloadManager::IsExecutableMimeType(const std::string& mime_type) {
-  for (int i=0; i < arraysize(kExecutableWhiteList); ++i) {
+  for (size_t i = 0; i < arraysize(kExecutableWhiteList); ++i) {
     if (net::MatchesMimeType(kExecutableWhiteList[i], mime_type))
       return true;
   }
-  for (int i=0; i < arraysize(kExecutableBlackList); ++i) {
+  for (size_t i = 0; i < arraysize(kExecutableBlackList); ++i) {
     if (net::MatchesMimeType(kExecutableBlackList[i], mime_type))
       return false;
   }
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 022a655..e7634dc 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -545,17 +545,17 @@ void ResourceMessageFilter::OnGetRootWindowRect(gfx::NativeViewId window_id,
 #endif  // OS_WIN
 
 void ResourceMessageFilter::OnGetMimeTypeFromExtension(
-    const std::wstring& ext, std::string* mime_type) {
+    const FilePath::StringType& ext, std::string* mime_type) {
   net::GetMimeTypeFromExtension(ext, mime_type);
 }
 
 void ResourceMessageFilter::OnGetMimeTypeFromFile(
-    const std::wstring& file_path, std::string* mime_type) {
+    const FilePath& file_path, std::string* mime_type) {
   net::GetMimeTypeFromFile(file_path, mime_type);
 }
 
 void ResourceMessageFilter::OnGetPreferredExtensionForMimeType(
-    const std::string& mime_type, std::wstring* ext) {
+    const std::string& mime_type, FilePath::StringType* ext) {
   net::GetPreferredExtensionForMimeType(mime_type, ext);
 }
 
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index c5b25f9..4133353 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -83,7 +83,7 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
   int render_process_host_id() const { return render_process_host_id_;}
 
   base::ProcessHandle renderer_handle() const { return render_handle_;}
-  
+
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -154,12 +154,12 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
   void OnGetWindowRect(gfx::NativeViewId window, gfx::Rect *rect);
   void OnGetRootWindowRect(gfx::NativeViewId window, gfx::Rect *rect);
 #endif
-  void OnGetMimeTypeFromExtension(const std::wstring& ext,
+  void OnGetMimeTypeFromExtension(const FilePath::StringType& ext,
                                   std::string* mime_type);
-  void OnGetMimeTypeFromFile(const std::wstring& file_path,
+  void OnGetMimeTypeFromFile(const FilePath& file_path,
                              std::string* mime_type);
   void OnGetPreferredExtensionForMimeType(const std::string& mime_type,
-                                          std::wstring* ext);
+                                          FilePath::StringType* ext);
   void OnGetCPBrowsingContext(uint32* context);
   void OnDuplicateSection(base::SharedMemoryHandle renderer_handle,
                           base::SharedMemoryHandle* browser_handle);
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index f61b122..915f8c7 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1037,14 +1037,14 @@ IPC_BEGIN_MESSAGES(ViewHost)
 
   // Sent to query MIME information.
   IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetMimeTypeFromExtension,
-                              std::wstring /* extension */,
+                              FilePath::StringType /* extension */,
                               std::string /* mime_type */)
   IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetMimeTypeFromFile,
-                              std::wstring /* file_path */,
+                              FilePath /* file_path */,
                               std::string /* mime_type */)
   IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetPreferredExtensionForMimeType,
                               std::string /* mime_type */,
-                              std::wstring /* extension */)
+                              FilePath::StringType /* extension */)
 
   // Get the CPBrowsingContext associated with the renderer sending this
   // message.
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index c532f06..a8a9486 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -173,7 +173,7 @@ void AppendToLog(const char* file, int line, const char* msg) {
   logging::LogMessage(file, line).stream() << msg;
 }
 
-bool GetMimeTypeFromExtension(const std::wstring &ext,
+bool GetMimeTypeFromExtension(const FilePath::StringType &ext,
                               std::string *mime_type) {
   if (IsPluginProcess())
     return net::GetMimeTypeFromExtension(ext, mime_type);
@@ -186,7 +186,7 @@ bool GetMimeTypeFromExtension(const std::wstring &ext,
   return !mime_type->empty();
 }
 
-bool GetMimeTypeFromFile(const std::wstring &file_path,
+bool GetMimeTypeFromFile(const FilePath &file_path,
                          std::string *mime_type) {
   if (IsPluginProcess())
     return net::GetMimeTypeFromFile(file_path, mime_type);
@@ -200,7 +200,7 @@ bool GetMimeTypeFromFile(const std::wstring &file_path,
 }
 
 bool GetPreferredExtensionForMimeType(const std::string& mime_type,
-                                      std::wstring* ext) {
+                                      FilePath::StringType* ext) {
   if (IsPluginProcess())
     return net::GetPreferredExtensionForMimeType(mime_type, ext);