Remove calls to deprecated APIs so that Chromium compiles on all currently-fu...

third_party/mozilla/include/NSURL+Utils.m

Index: third_party/mozilla/include/NSURL+Utils.m
===================================================================
--- third_party/mozilla/include/NSURL+Utils.m	(revision 20947)
+++ third_party/mozilla/include/NSURL+Utils.m	(working copy)
@@ -79,7 +79,14 @@
         long size;
         
         size = GetMaxResourceSize(urlResHandle);
-        ret = [NSURL URLWithString:[NSString stringWithCString:(char *)*urlResHandle length:size]];
+// Begin Google Modified
+//        ret = [NSURL URLWithString:[NSString stringWithCString:(char *)*urlResHandle length:size]];
+        NSString *urlString = [[[NSString alloc] initWithBytes:(void *)*urlResHandle
+                                                        length:size
+                                                      encoding:NSMacOSRomanStringEncoding]  // best guess here
+                               autorelease];
+        ret = [NSURL URLWithString:urlString];
+// End Google Modified
       }
       
       CloseResFile(resRef);
@@ -108,7 +115,13 @@
   // Is this really an IE .url file?
   if (inFile) {
     NSCharacterSet *newlines = [NSCharacterSet characterSetWithCharactersInString:@"\r\n"];
-    NSScanner *scanner = [NSScanner scannerWithString:[NSString stringWithContentsOfFile:inFile]];
+    // Begin Google Modified
+//    NSScanner *scanner = [NSScanner scannerWithString:[NSString stringWithContentsOfFile:inFile]];
+    NSString *fileString = [NSString stringWithContentsOfFile:inFile
+                                                     encoding:NSWindowsCP1252StringEncoding  // best guess here

[pink (ping after 24hrs), 2009/07/17 19:36:57]

IE here is Mac IE 5, not winIE. The encoding is probably something mac-like.

[Avi (use Gerrit), 2009/07/17 19:52:18]

Really, though? Mac IE 5 hasn't been around since 1994, five years. The user's
much more likely to get a .url file from Windows than Mac IE 5 (I've personally
seen this...).

+                                                        error:nil];
+    NSScanner *scanner = [NSScanner scannerWithString:fileString];
+    // End Google Modified
     [scanner scanUpToString:@"[InternetShortcut]" intoString:nil];
     
     if ([scanner scanString:@"[InternetShortcut]" intoString:nil]) {