fix redundant methods for getting current URI (bug 337664)

camino/src/application/MainController.mm

@@ -1478,7 +1478,7 @@ Otherwise, we return the URL we originally got. Right now this supports .url,
   
   if (action == @selector(sendURL:))
   {
-    NSString* urlString = [[[self getMainWindowBrowserController] getBrowserWrapper] location];
+    NSString* urlString = [[[self getMainWindowBrowserController] getBrowserWrapper] getCurrentURI];
     return ![MainController isBlankURL:urlString];
   }
 

camino/src/browser/BrowserWindowController.mm

@@ -1644,7 +1644,7 @@ enum BWCOpenDest {
   [self showSecurityState:  [mBrowserView securityState]];
   [self updateSiteIcons:    [mBrowserView siteIcon] ignoreTyping:NO];
   [self updateStatus:       [mBrowserView statusString]];
-  [self updateLocationFields:[mBrowserView location] ignoreTyping:NO];
+  [self updateLocationFields:[mBrowserView getCurrentURI] ignoreTyping:NO];
 }
 
 #pragma mark -

camino/src/browser/BrowserWrapper.h

@@ -187,7 +187,6 @@ class nsISupportsArray;
 - (NSString*)windowTitle;
 - (NSString*)pageTitle;
 - (NSImage*)siteIcon;
-- (NSString*)location;
 - (NSString*)statusString;
 - (float)loadingProgress;
 - (BOOL)popupsBlocked;

camino/src/browser/BrowserWrapper.mm

@@ -301,11 +301,6 @@ static NSString* const kOfflineNotificationName = @"offlineModeChanged";
   return mSiteIconImage;
 }
 
-- (NSString*)location
-{
-  return [mBrowserView getCurrentURI];
-}
-
 - (NSString*)statusString
 {
   // XXX is this right?