Revert 267095 "Remove WebUI NTP on Android."

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 66 matching lines @@
 
 void MostVisitedHandler::RegisterMessages() {
   Profile* profile = Profile::FromWebUI(web_ui());
   // Set up our sources for thumbnail and favicon data.
   content::URLDataSource::Add(profile, new ThumbnailSource(profile, false));
   content::URLDataSource::Add(profile, new ThumbnailSource(profile, true));
 
   // 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));
 
   history::TopSites* ts = profile->GetTopSites();
   if (ts) {
     // TopSites updates itself after a delay. This is especially noticable when
     // your profile is empty. Ask TopSites to update itself when we're about to
     // show the new tab page.
     ts->SyncWithHistory();
@@ skipping 166 matching lines @@
   if (ts)
     ts->AddBlacklistedURL(url);
   content::RecordAction(UserMetricsAction("MostVisited_UrlBlacklisted"));
 }
 
 std::string MostVisitedHandler::GetDictionaryKeyForUrl(const std::string& url) {
   return base::MD5String(url);
 }
 
 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;
 
   TabStripModel* tab_strip_model = chrome::FindBrowserWithWebContents(
       web_ui()->GetWebContents())->tab_strip_model();
   history::TopSites* top_sites = Profile::FromWebUI(web_ui())->GetTopSites();
   if (!tab_strip_model || !top_sites) {
     NOTREACHED();
     return;
   }
 
   std::set<std::string> open_urls;
   chrome::GetOpenUrls(*tab_strip_model, *top_sites, &open_urls);
   history::MostVisitedTilesExperiment::RemovePageValuesMatchingOpenTabs(
       open_urls,
       pages_value_.get());
+#endif
 }
 
 // static
 void MostVisitedHandler::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
       prefs::kNtpMostVisitedURLsBlacklist,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }