Mucelage changes for Mac TestShell, to work with the current glue in the

non-PLATFORM(MAC) world.
Review URL: http://codereview.chromium.org/8122

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

1 files changed, 8 insertions, 8 deletions

diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 37a34de..bdb2626 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -818,8 +818,8 @@ void AppendToLog(const char* file, int line, const char* msg) {
   logging::LogMessage(file, line).stream() << msg;
 }
 
-bool GetMimeTypeFromExtension(std::string &ext, std::string* mime_type) {
-  return net::GetMimeTypeFromExtension(UTF8ToWide(ext), mime_type);
+bool GetMimeTypeFromExtension(const std::wstring &ext, std::string* mime_type) {
+  return net::GetMimeTypeFromExtension(ext, mime_type);
 }
 
 bool GetMimeTypeFromFile(const std::string &file_path,
@@ -828,12 +828,8 @@ bool GetMimeTypeFromFile(const std::string &file_path,
 }
 
 bool GetPreferredExtensionForMimeType(const std::string& mime_type,
-                                      std::string* ext) {
-  std::wstring wide_ext;
-  bool result = net::GetPreferredExtensionForMimeType(mime_type, &wide_ext);
-  if (result)
-    *ext = WideToUTF8(wide_ext);
-  return result;
+                                      std::wstring* ext) {
+  return net::GetPreferredExtensionForMimeType(mime_type, ext);
 }
 
 std::wstring GetLocalizedString(int message_id) {
@@ -877,6 +873,10 @@ NSCursor* LoadCursor(int cursor_id) {
   return [NSCursor arrowCursor];
 }
 
+CGImageRef GetBitmapResource(int resource_id) {
+  return NULL;
+}
+
 bool GetApplicationDirectory(std::string* path) {
   NSString* bundle_path = [[NSBundle mainBundle] bundlePath];
   if (!bundle_path)