Fix -[NSString isValidURI].

third_party/mozilla/NSString+Utils.mm

 /* ***** 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 21 matching lines @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #import <AppKit/AppKit.h>               // for NSStringDrawing.h
 
 #import "NSString+Utils.h"
+#include "googleurl/src/gurl.h"
 
 
 @implementation NSString (ChimeraStringUtils)
 
 + (id)ellipsisString
 {
   static NSString* sEllipsisString = nil;
   if (!sEllipsisString) {
     unichar ellipsisChar = 0x2026;
     sEllipsisString = [[NSString alloc] initWithCharacters:&ellipsisChar length:1];
@@ skipping 30 matching lines @@
   return ([self hasCaseInsensitivePrefix:@"javascript:"] || [self hasCaseInsensitivePrefix:@"data:"]);
 }
 
 - (BOOL)isPotentiallyDangerousURI
 {
   return ([self hasCaseInsensitivePrefix:@"javascript:"] || [self hasCaseInsensitivePrefix:@"data:"]);
 }
 
 - (BOOL)isValidURI
 {
-  // This will only return a non-nil object for valid, well-formed URI strings
-  NSURL* testURL = [NSURL URLWithString:self];
+  // isValid() will only be true for valid, well-formed URI strings
+  GURL testURL([self UTF8String]);
 
   // |javascript:| and |data:| URIs might not have passed the test,
   // but spaces will work OK, so evaluate them separately.
-  if ((testURL) || [self isLooselyValidatedURI]) {
+  if ((testURL.is_valid()) || [self isLooselyValidatedURI]) {
     return YES;
   }
   return NO;
 }
 
 - (NSString *)stringByRemovingCharactersInSet:(NSCharacterSet*)characterSet
 {
   NSScanner*       cleanerScanner = [NSScanner scannerWithString:self];
   NSMutableString* cleanString    = [NSMutableString stringWithCapacity:[self length]];
   // Make sure we don't skip whitespace, which NSScanner does by default
@@ skipping 245 matching lines @@
 - (NSString*)unescapedURI
 {
   NSString *unescapedURI = (NSString*)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
                                                                             (CFStringRef)self,
                                                                             CFSTR(" \"\';/?:@&=+$,#"),
                                                                             kCFStringEncodingUTF8);
   return unescapedURI ? [unescapedURI autorelease] : self;
 }
 
 @end