[Local NTP] Cleanup: Remove support for "icons" layout

chrome/browser/search/local_ntp_source.cc

 // Copyright 2013 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/search/local_ntp_source.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 70 matching lines @@
     return false;
 
   const TemplateURL* default_provider =
       template_url_service->GetDefaultSearchProvider();
   return default_provider &&
       (default_provider->GetEngineType(
           template_url_service->search_terms_data()) ==
        SEARCH_ENGINE_GOOGLE);
 }
 
-// Returns whether icon NTP is enabled by experiment.
-// 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,
                int resource_id) {
   dictionary->SetString(key, l10n_util::GetStringUTF16(resource_id));
 }
 
 // Adds a localized string for the Google searchbox placeholder text.
 void AddGoogleSearchboxPlaceholderString(base::DictionaryValue* dictionary) {
   base::string16 placeholder = l10n_util::GetStringFUTF16(
@@ skipping 25 matching lines @@
   return translated_strings;
 }
 
 // Returns a JS dictionary of configuration data for the local NTP.
 std::string GetConfigData(Profile* profile) {
   base::DictionaryValue config_data;
   bool is_google = DefaultSearchProviderIsGoogle(profile);
   config_data.Set("translatedStrings",
                   GetTranslatedStrings(is_google).release());
   config_data.SetBoolean("isGooglePage", is_google);
-  config_data.SetBoolean("useIcons", IsIconNTPEnabled());
 
   // Serialize the dictionary.
   std::string js_text;
   JSONStringValueSerializer serializer(&js_text);
   serializer.Serialize(config_data);
 
   std::string config_data_js;
   config_data_js.append("var configData = ");
   config_data_js.append(js_text);
   config_data_js.append(";");
@@ skipping 107 matching lines @@
     }
   }
   return false;
 }
 
 std::string LocalNtpSource::GetContentSecurityPolicyChildSrc() const {
   // Allow embedding of most visited iframes.
   return base::StringPrintf("child-src %s;",
                             chrome::kChromeSearchMostVisitedUrl);
 }