Add new NTP layout with snippet cards and hide it behind a flag

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
index dd5c437b371f3beb5b8acb58a6e6eaf22b6f577b..e4fa5e813d9536cd14cf309701665d2b6b334065 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -246,7 +246,8 @@ public class NewTabPage
 
         @Override
         public boolean isToolbarEnabled() {
-            return ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_TOOLBAR);
+            return ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_TOOLBAR)
+                    || ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS);

[newt (away), 2016/03/23 05:29:37]

Is this check backwards? I'd expect the toolbar to be disabled when snippets are
enabled.

[May, 2016/03/23 19:22:56]

Wait... this is weird. I must not have uploaded a newer change, it's the correct
way in my local copy ( &&
!ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS). Anyways, done.

         }
 
         private void recordOpenedMostVisitedItem(MostVisitedItem item) {
@@ -657,13 +658,8 @@ public class NewTabPage
     }
 
     private void updateSearchProviderHasLogo() {
-        if (ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS)) {
-            mSearchProviderHasLogo = false;
-            if (mNewTabPageView != null) mNewTabPageView.setSearchProviderHasLogo(false);
-        } else {
-            mSearchProviderHasLogo = !mOptOutPromoShown
-                    && TemplateUrlService.getInstance().isDefaultSearchEngineGoogle();
-        }
+        mSearchProviderHasLogo = !mOptOutPromoShown
+                && TemplateUrlService.getInstance().isDefaultSearchEngineGoogle();
     }
 
     private void onSearchEngineUpdated() {