Merge for backout of changeset cf4d10139ec0

content/base/src/Link.cpp

@@ -58,11 +58,6 @@ Link::Link()
 {
 }
 
-Link::~Link()
-{
-  UnregisterFromHistory();
-}
-
 nsLinkState
 Link::GetLinkState() const
 {
@@ -466,11 +461,13 @@ Link::UnregisterFromHistory()
     return;
   }
 
-  NS_ASSERTION(mCachedURI, "mRegistered is true, but we have no cached URI?!");
+  // Obtain the URI that we registered with.
+  nsCOMPtr<nsIURI> hrefURI(GetURI());
+  NS_ASSERTION(hrefURI, "mRegistered is true, but we have no URI?!");
 
   // And tell History to stop tracking us.
   IHistory *history = nsContentUtils::GetHistory();
-  nsresult rv = history->UnregisterVisitedCallback(mCachedURI, this);
+  nsresult rv = history->UnregisterVisitedCallback(hrefURI, this);
   NS_ASSERTION(NS_SUCCEEDED(rv), "This should only fail if we misuse the API!");
   if (NS_SUCCEEDED(rv)) {
     mRegistered = false;

content/base/src/Link.h

@@ -93,8 +93,6 @@ protected:
    */
   virtual void ResetLinkState();
 
-  virtual ~Link();
-
 private:
   /**
    * Unregisters from History so this node no longer gets notifications about

toolkit/components/places/tests/cpp/mock_Link.h

@@ -94,10 +94,6 @@ Link::Link()
 {
 }
 
-Link::~Link()
-{
-}
-
 nsLinkState
 Link::GetLinkState() const
 {