[Android] Upstream remaining changes to NTP UI code.

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 56 matching lines @@
                               NUM_NTP_FOLLOW_ACTIONS);
   }
 }
 
 void MostVisitedHandler::RegisterMessages() {
   Profile* profile = Profile::FromWebUI(web_ui());
   // Set up our sources for thumbnail and favicon data.
   ThumbnailSource* thumbnail_src = new ThumbnailSource(profile);
   ChromeURLDataManager::AddDataSource(profile, thumbnail_src);
 
+#if defined(OS_ANDROID)
+  // Register chrome://touch-icon as a data source for touch icons or favicons.
+  ChromeURLDataManager::AddDataSource(profile,
+      new FaviconSource(profile, FaviconSource::ANY));
+#endif
+  // Register chrome://favicon as a data source for favicons.
   ChromeURLDataManager::AddDataSource(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 161 matching lines @@
 
 std::string MostVisitedHandler::GetDictionaryKeyForUrl(const std::string& url) {
   return base::MD5String(url);
 }
 
 // static
 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kNtpMostVisitedURLsBlacklist,
                                 PrefService::UNSYNCABLE_PREF);
 }