Use isDiscoveryInNTPEnabled flag instead of isSuggestionsPageEnabled flag to control suggestions

chrome/browser/resources/ntp4/new_tab.js

 // 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.
 
 /**
  * @fileoverview New tab page
  * This is the main code for the new tab page used by touch-enabled Chrome
  * browsers.  For now this is still a prototype.
  */
 
@@ skipping 90 matching lines @@
       if (infoBubble)
         window.setTimeout(infoBubble.reposition.bind(infoBubble), 0);
     }
   };
 
   /**
    * Invoked at startup once the DOM is available to initialize the app.
    */
   function onLoad() {
     sectionsToWaitFor = loadTimeData.getBoolean('showApps') ? 2 : 1;
-    if (loadTimeData.getBoolean('isSuggestionsPageEnabled'))
+    if (loadTimeData.getBoolean('isDiscoveryInNTPEnabled'))
       sectionsToWaitFor++;
     measureNavDots();
 
     // Load the current theme colors.
     themeChanged();
 
     newTabView = new NewTabView();
 
     notificationContainer = getRequiredElement('notification-container');
     notificationContainer.addEventListener(
@@ skipping 11 matching lines @@
     var mostVisited = new ntp.MostVisitedPage();
     // Move the footer into the most visited page if we are in "bare minimum"
     // mode.
     if (document.body.classList.contains('bare-minimum'))
       mostVisited.appendFooter(getRequiredElement('footer'));
     newTabView.appendTilePage(mostVisited,
                               loadTimeData.getString('mostvisited'),
                               false);
     chrome.send('getMostVisited');
 
-    if (loadTimeData.getBoolean('isSuggestionsPageEnabled')) {
+    if (loadTimeData.getBoolean('isDiscoveryInNTPEnabled')) {
       var suggestions_script = document.createElement('script');
       suggestions_script.src = 'suggestions_page.js';
       suggestions_script.onload = function() {
          newTabView.appendTilePage(new ntp.SuggestionsPage(),
                                    loadTimeData.getString('suggestions'),
                                    false,
                                    (newTabView.appsPages.length > 0) ?
                                        newTabView.appsPages[0] : null);
          chrome.send('getSuggestions');
          cr.dispatchSimpleEvent(document, 'sectionready', true, true);
@@ skipping 432 matching lines @@
     setStripeColor: setStripeColor,
     showNotification: showNotification,
     themeChanged: themeChanged,
     updateLogin: updateLogin
   };
 });
 
 document.addEventListener('DOMContentLoaded', ntp.onLoad);
 
 var toCssPx = cr.ui.toCssPx;