Backout history changes to reflect the review and landing of bug 702037 on m-c. r=blassey

--HG--
extra : rebase_source : 698971168fdc4c119d6019ef091055659353fb35

toolkit/components/places/History.cpp

@@ -1760,17 +1760,6 @@ NS_IMETHODIMP
 History::RegisterVisitedCallback(nsIURI* aURI,
                                  Link* aLink)
 {
-  //xxx
-  // Disable this, along with MOZ_PLACES.  We are giving up
-  // link visitied highlighting because it currently
-  // requires a large database (places).  In the future, it
-  // would be nice if we could be smarter about what we
-  // persist and have some sort of memory/time limit before
-  // evicting.
-#ifdef ANDROID
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-
   NS_ASSERTION(aURI, "Must pass a non-null URI!");
   if (XRE_GetProcessType() == GeckoProcessType_Content) {
     NS_PRECONDITION(aLink, "Must pass a non-null Link!");

toolkit/components/places/nsNavHistory.cpp

@@ -373,15 +373,6 @@ nsNavHistory::~nsNavHistory()
 nsresult
 nsNavHistory::Init()
 {
-
-  // XXX
-  // For the native ui on android, we will not be using MOZ_PLACES.
-  // Currently places has deeply weaved it way throughout the gecko codebase.
-  // Here we disable all database creation and loading of places.
-#ifdef ANDROID
-  return NS_ERROR_NOT_IMPLEMENTED;
-#endif
-
   NS_TIME_FUNCTION;
 
   LoadPrefs();