Bug 697856 - Removed Unused Function Definitions in nsFaviconService.h; r=mak

mobile/chrome/content/aboutCertError.xhtml

@@ -63,7 +63,7 @@
          If the location of the favicon is changed for both pages, the
          FAVICON_ERRORPAGE_URL symbol in toolkit/components/places/src/nsFaviconService.h
          should be updated. If this page starts using a different favicon
-         than neterrorm nsFaviconService->DoSetAndLoadFaviconForPage
+         than neterrorm nsFaviconService->SetAndLoadFaviconForPage
          should be updated to ignore this one as well. -->
     <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
 

toolkit/components/places/nsFaviconService.h

@@ -97,12 +97,6 @@ public:
     return gFaviconService;
   }
 
-  // internal version called by history when done lazily
-  nsresult DoSetAndLoadFaviconForPage(nsIURI* aPageURI,
-                                      nsIURI* aFaviconURI,
-                                      bool aForceReload,
-                                      nsIFaviconDataCallback* aCallback);
-
   // addition to API for strings to prevent excessive parsing of URIs
   nsresult GetFaviconLinkForIconString(const nsCString& aIcon, nsIURI** aOutput);
   void GetFaviconSpecForIconString(const nsCString& aIcon, nsACString& aOutput);
@@ -125,17 +119,6 @@ public:
   nsresult GetFaviconDataAsync(nsIURI* aFaviconURI,
                                mozIStorageStatementCallback* aCallback);
 
-  /**
-   * Checks to see if a favicon's URI has changed, and notifies callers if it
-   * has.
-   *
-   * @param aPageURI
-   *        The URI of the page aFaviconURI is for.
-   * @param aFaviconURI
-   *        The URI for the favicon we want to test for on aPageURI.
-   */
-  void checkAndNotify(nsIURI* aPageURI, nsIURI* aFaviconURI);
-
   /**
    * Call to send out favicon changed notifications. Should only be called
    * when there is data loaded for the favicon.
@@ -181,9 +164,6 @@ private:
   PRUint32 mFailedFaviconSerial;
   nsDataHashtable<nsCStringHashKey, PRUint32> mFailedFavicons;
 
-  nsresult SetFaviconUrlForPageInternal(nsIURI* aURI, nsIURI* aFavicon,
-                                        bool* aHasData);
-
   // Caches the content of the default favicon if it's not already cached and
   // copies it into byteStr.
   nsresult GetDefaultFaviconData(nsCString& byteStr);