Revert 267095 "Remove WebUI NTP on Android."

trunk/src/chrome/browser/ui/webui/ntp/most_visited_handler.cc

Index: trunk/src/chrome/browser/ui/webui/ntp/most_visited_handler.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/ntp/most_visited_handler.cc	(revision 267099)
+++ trunk/src/chrome/browser/ui/webui/ntp/most_visited_handler.cc	(working copy)
@@ -84,6 +84,11 @@
   // Set up our sources for top-sites data.
   content::URLDataSource::Add(profile, new ThumbnailListSource(profile));
 
+#if defined(OS_ANDROID)
+  // Register chrome://touch-icon as a data source for touch icons or favicons.
+  content::URLDataSource::Add(profile,
+                              new FaviconSource(profile, FaviconSource::ANY));
+#endif
   // Register chrome://favicon as a data source for favicons.
   content::URLDataSource::Add(
       profile, new FaviconSource(profile, FaviconSource::FAVICON));
@@ -270,6 +275,9 @@
 }
 
 void MostVisitedHandler::MaybeRemovePageValues() {
+// The code below uses APIs not available on Android and the experiment should
+// not run there.
+#if !defined(OS_ANDROID)
   if (!history::MostVisitedTilesExperiment::IsDontShowOpenURLsEnabled())
     return;
 
@@ -286,6 +294,7 @@
   history::MostVisitedTilesExperiment::RemovePageValuesMatchingOpenTabs(
       open_urls,
       pages_value_.get());
+#endif
 }
 
 // static