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

third_party/mozilla/include/NSURL+Utils.m

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 61 matching lines @@
     
     resRef = FSOpenResFile(&ref, fsRdPerm);
     
     if (resRef != -1) { // Has resouce fork.
       Handle urlResHandle;
       
       if ((urlResHandle = Get1Resource('url ', 256))) { // Has 'url ' resource with ID 256.
         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);
     }
 
     if (!ret) { // Look for valid plist data.
       NSDictionary *plist;
       if ((plist = [[NSDictionary alloc] initWithContentsOfFile:inFile])) {
         ret = [NSURL URLWithString:[plist objectForKey:@"URL"]];
         [plist release];
       }
     }
   }
   
   return ret;
 }
 
 //
 // Reads the URL from a .url file.
 // Returns the URL or nil on failure.
 //
 +(NSURL*)URLFromIEURLFile:(NSString*)inFile
 {
   NSURL *ret = nil;
   
   // 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]) {
       // Scan each non-empty line in this section. We don't need to explicitly scan the newlines or
       // whitespace because NSScanner ignores these by default.
       NSString *line;
       
       while ([scanner scanUpToCharactersFromSet:newlines intoString:&line]) {
         if ([line hasPrefix:@"URL="]) {
           ret = [NSURL URLWithString:[line substringFromIndex:4]];
           break;
         }
         else if ([line hasPrefix:@"["]) {
           // This is the start of a new section, so if we haven't found an URL yet, we should bail.
           break;
         }
       }
     }
   }
   
   return ret;
 }
 
 @end