Clean up IconNTP-related code

chrome/browser/search/local_ntp_source.cc

Index: chrome/browser/search/local_ntp_source.cc
diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc
index bfa03c73a987352e0de42a63e44ac311fac6c141..00c18bede20352ab4a2ca6c1dfd2a1f77140b73d 100644
--- a/chrome/browser/search/local_ntp_source.cc
+++ b/chrome/browser/search/local_ntp_source.cc
@@ -88,21 +88,6 @@ bool DefaultSearchProviderIsGoogle(Profile* profile) {
        SEARCH_ENGINE_GOOGLE);
 }
 
-// Returns whether icon NTP is enabled by experiment.

[Marc Treib, 2017/02/06 09:19:51]

https://codereview.chromium.org/2670123003/ :D

[Marc Treib, 2017/02/06 10:36:22]

FYI: That CL should land Very Soon Now, so you'll probably have to rebase
(trivially).

-// TODO(huangs): Remove all 3 copies of this routine once Icon NTP launches.
-bool IsIconNTPEnabled() {
-  // Note: It's important to query the field trial state first, to ensure that
-  // UMA reports the correct group.
-  const std::string group_name = base::FieldTrialList::FindFullName("IconNTP");
-  using base::CommandLine;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableIconNtp))
-    return false;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableIconNtp))
-    return true;
-
-  return base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
-}
-
 // Adds a localized string keyed by resource id to the dictionary.
 void AddString(base::DictionaryValue* dictionary,
                const std::string& key,
@@ -148,7 +133,7 @@ std::string GetConfigData(Profile* profile) {
   config_data.Set("translatedStrings",
                   GetTranslatedStrings(is_google).release());
   config_data.SetBoolean("isGooglePage", is_google);
-  config_data.SetBoolean("useIcons", IsIconNTPEnabled());
+  config_data.SetBoolean("useIcons", false);
 
   // Serialize the dictionary.
   std::string js_text;