Revert of Add NTPCondensedLayout to test config.

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.ntp;
 
 import android.graphics.Canvas;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
@@ skipping 372 matching lines @@
             webServer.shutdown();
         }
     }
 
     /**
      * Tests setting whether the search provider has a logo.
      */
     @Test
     @SmallTest
     @Feature({"NewTabPage"})
-    @CommandLineFlags.Add("disable-features=NTPCondensedLayout")
     public void testSetSearchProviderHasLogo() throws Throwable {
         mActivityTestRule.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 NewTabPageView ntpView = mNtp.getNewTabPageView();
                 View logoView = ntpView.findViewById(R.id.search_provider_logo);
                 Assert.assertEquals(View.VISIBLE, logoView.getVisibility());
                 ntpView.setSearchProviderHasLogo(false);
                 Assert.assertEquals(View.GONE, logoView.getVisibility());
                 ntpView.setSearchProviderHasLogo(true);
@@ skipping 24 matching lines @@
         });
     }
 
     /**
      * Verifies that the placeholder is only shown when there are no tile suggestions and the search
      * provider has no logo.
      */
     @Test
     @SmallTest
     @Feature({"NewTabPage"})
-    @CommandLineFlags.Add("disable-features=NTPCondensedLayout")
     public void testPlaceholder() {
         final NewTabPageView ntpView = mNtp.getNewTabPageView();
         final View logoView = ntpView.findViewById(R.id.search_provider_logo);
         final View searchBoxView = ntpView.findViewById(R.id.search_box);
 
         // Initially, the logo is visible, the search box is visible, there is one tile suggestion,
         // and the placeholder has not been inflated yet.
         Assert.assertEquals(View.VISIBLE, logoView.getVisibility());
         Assert.assertEquals(View.VISIBLE, searchBoxView.getVisibility());
         Assert.assertEquals(1, mTileGridLayout.getChildCount());
@@ skipping 115 matching lines @@
      */
     private void waitForFakeboxTopPosition(final NewTabPage ntp, int position) {
         CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return getFakeboxTop(ntp);
             }
         }));
     }
 }