Revert "In new-tab-Chrome-Home put the logo inside the RecyclerView."

This reverts commit 2518c6f4.

Reason for revert: RecyclerView crash as reported in
https://bugs.chromium.org/p/chromium/issues/detail?id=784238

Original change's description:
> In new-tab-Chrome-Home put the logo inside the RecyclerView.
> 
> Bug: 781163
> Change-Id: Id0957afdf125feeefb6dbfa36c9b3754552c735f
> Reviewed-on: https://chromium-review.googlesource.com/759002
> Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
> Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#515591}

TBR=bauerb@chromium.org,mvanouwerkerk@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 781163
Change-Id: I2850621a04dad0feb00f778d3ffe8374177294dd
Reviewed-on: https://chromium-review.googlesource.com/765807Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#515936}

chrome/android/java/res/layout/suggestions_bottom_sheet_content.xml

@@ -13,5 +13,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        android:paddingTop="@dimen/bottom_control_container_height" />
+        android:paddingTop="@dimen/bottom_control_container_height"
+        android:clipToPadding="false" />
+
+    <!-- The logo should be rendered on top of the RecyclerView, so it goes below in code order. -->
+    <org.chromium.chrome.browser.ntp.LogoView
+        android:id="@+id/search_provider_logo"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/ntp_logo_height"
+        android:layout_marginTop="@dimen/ntp_logo_margin_top_modern"
+        android:layout_marginBottom="@dimen/ntp_logo_margin_bottom_modern" />
+
 </FrameLayout>

chrome/android/java/res/layout/suggestions_bottom_sheet_logo.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 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. -->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/ntp_logo_height">
-
-    <org.chromium.chrome.browser.ntp.LogoView
-        android:id="@+id/search_provider_logo"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/ntp_logo_height"
-        android:layout_marginTop="@dimen/ntp_logo_margin_top_modern"
-        android:layout_marginBottom="@dimen/ntp_logo_margin_bottom_modern" />
-
-</FrameLayout>
\ No newline at end of file

chrome/android/java/res/values/dimens.xml

@@ -326,8 +326,7 @@
     <dimen name="tile_view_title_margin_top_modern">61dp</dimen>
     <dimen name="ntp_logo_height">116dp</dimen>
     <dimen name="ntp_logo_margin_top_modern">25dp</dimen>
-    <!-- bottom_control_container_height + 8 -->
-    <dimen name="ntp_logo_margin_bottom_modern">64dp</dimen>
+    <dimen name="ntp_logo_margin_bottom_modern">8dp</dimen>
     <dimen name="ntp_search_box_height">62dp</dimen>
     <dimen name="ntp_search_box_shadow_width">4dp</dimen>
     <dimen name="ntp_search_box_transition_length">16dp</dimen>

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

@@ -303,10 +303,9 @@ public class NewTabPageView extends FrameLayout implements TileGroup.Observer {
         mRecyclerView.init(mUiConfig, mContextMenuManager);
 
         // Set up snippets
-        NewTabPageAdapter newTabPageAdapter =
-                new NewTabPageAdapter(mManager, mNewTabPageLayout, /* logoView = */ null, mUiConfig,
-                        offlinePageBridge, mContextMenuManager, /* tileGroupDelegate = */ null,
-                        /* suggestionsCarousel = */ null);
+        NewTabPageAdapter newTabPageAdapter = new NewTabPageAdapter(mManager, mNewTabPageLayout,
+                mUiConfig, offlinePageBridge, mContextMenuManager, /* tileGroupDelegate = */ null,
+                /* suggestionsCarousel = */ null);
         newTabPageAdapter.refreshSuggestions();
         mRecyclerView.setAdapter(newTabPageAdapter);
         mRecyclerView.getLinearLayoutManager().scrollToPosition(scrollPosition);

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ItemViewType.java

@@ -17,10 +17,10 @@ import java.lang.annotation.RetentionPolicy;
  *
  * @see Adapter#getItemViewType(int)
  */
-@IntDef({ItemViewType.ABOVE_THE_FOLD, ItemViewType.LOGO, ItemViewType.SITE_SECTION,
-        ItemViewType.HEADER, ItemViewType.SNIPPET, ItemViewType.SPACING, ItemViewType.STATUS,
-        ItemViewType.PROGRESS, ItemViewType.ACTION, ItemViewType.FOOTER, ItemViewType.PROMO,
-        ItemViewType.ALL_DISMISSED, ItemViewType.CAROUSEL})
+@IntDef({ItemViewType.ABOVE_THE_FOLD, ItemViewType.SITE_SECTION, ItemViewType.HEADER,
+        ItemViewType.SNIPPET, ItemViewType.SPACING, ItemViewType.STATUS, ItemViewType.PROGRESS,
+        ItemViewType.ACTION, ItemViewType.FOOTER, ItemViewType.PROMO, ItemViewType.ALL_DISMISSED,
+        ItemViewType.CAROUSEL})
 @Retention(RetentionPolicy.SOURCE)
 public @interface ItemViewType {
     /**
@@ -29,77 +29,71 @@ public @interface ItemViewType {
      * @see Adapter#getItemViewType(int)
      */
     int ABOVE_THE_FOLD = 1;
-    /**
-     * View type for the logo
-     *
-     * @see Adapter#getItemViewType(int)
-     */
-    int LOGO = 2;
     /**
      * View type for a {@code SiteSection}.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int SITE_SECTION = 3;
+    int SITE_SECTION = 2;
     /**
      * View type for card group headers
      *
      * @see Adapter#getItemViewType(int)
      */
-    int HEADER = 4;
+    int HEADER = 3;
     /**
      * View type for snippet cards
      *
      * @see Adapter#getItemViewType(int)
      */
-    int SNIPPET = 5;
+    int SNIPPET = 4;
     /**
      * View type for a {@link SpacingItem} used to provide spacing at the end of the list.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int SPACING = 6;
+    int SPACING = 5;
     /**
      * View type for a {@link StatusItem}, the card displaying status information
      *
      * @see Adapter#getItemViewType(int)
      */
-    int STATUS = 7;
+    int STATUS = 6;
     /**
      * View type for a {@link ProgressItem}, the progress indicator.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int PROGRESS = 8;
+    int PROGRESS = 7;
     /**
      * View type for a {@link ActionItem}, an action button.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int ACTION = 9;
+    int ACTION = 8;
     /**
      * View type for a {@link Footer}.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int FOOTER = 10;
+    int FOOTER = 9;
     /**
      * View type for a {@link SignInPromo}.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int PROMO = 11;
+    int PROMO = 10;
     /**
      * View type for a {@link AllDismissedItem}.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int ALL_DISMISSED = 12;
+    int ALL_DISMISSED = 11;
 
     /**
      * View type for a {@link SuggestionsCarousel}.
      *
      * @see Adapter#getItemViewType(int)
      */
-    int CAROUSEL = 13;
+    int CAROUSEL = 12;
 }

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java

@@ -14,7 +14,6 @@ import org.chromium.base.Callback;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ntp.ContextMenuManager;
-import org.chromium.chrome.browser.ntp.LogoView;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageViewHolder.PartialBindCallback;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
@@ -25,7 +24,6 @@ import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
 import org.chromium.chrome.browser.ntp.snippets.SuggestionsSource;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.suggestions.DestructionObserver;
-import org.chromium.chrome.browser.suggestions.LogoItem;
 import org.chromium.chrome.browser.suggestions.SiteSection;
 import org.chromium.chrome.browser.suggestions.SuggestionsCarousel;
 import org.chromium.chrome.browser.suggestions.SuggestionsConfig;
@@ -49,16 +47,17 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
     private final ContextMenuManager mContextMenuManager;
     private final OfflinePageBridge mOfflinePageBridge;
 
-    private final @Nullable View mAboveTheFoldView;
-    private final @Nullable LogoView mLogoView;
+    @Nullable
+    private final View mAboveTheFoldView;
     private final UiConfig mUiConfig;
     private SuggestionsRecyclerView mRecyclerView;
 
     private final InnerNode mRoot;
 
-    private final @Nullable AboveTheFoldItem mAboveTheFold;
-    private final @Nullable LogoItem mLogo;
-    private final @Nullable SiteSection mSiteSection;
+    @Nullable
+    private final AboveTheFoldItem mAboveTheFold;
+    @Nullable
+    private final SiteSection mSiteSection;
     private final SuggestionsCarousel mSuggestionsCarousel;
     private final SectionList mSections;
     private final SignInPromo mSigninPromo;
@@ -72,9 +71,6 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
      * @param aboveTheFoldView the layout encapsulating all the above-the-fold elements
      *         (logo, search box, most visited tiles), or null if only suggestions should
      *         be displayed.
-     * @param logoView the view for the logo, which may be provided when {@code aboveTheFoldView} is
-     *         null. They are not expected to be both non-null as that would lead to showing the
-     *         logo twice.
      * @param uiConfig the NTP UI configuration, to be passed to created views.
      * @param offlinePageBridge used to determine if articles are available.
      * @param contextMenuManager used to build context menus.
@@ -83,16 +79,13 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
      *         suggestions.
      */
     public NewTabPageAdapter(SuggestionsUiDelegate uiDelegate, @Nullable View aboveTheFoldView,
-            @Nullable LogoView logoView, UiConfig uiConfig, OfflinePageBridge offlinePageBridge,
+            UiConfig uiConfig, OfflinePageBridge offlinePageBridge,
             ContextMenuManager contextMenuManager, @Nullable TileGroup.Delegate tileGroupDelegate,
             @Nullable SuggestionsCarousel suggestionsCarousel) {
-        assert !(aboveTheFoldView != null && logoView != null);
-
         mUiDelegate = uiDelegate;
         mContextMenuManager = contextMenuManager;
 
         mAboveTheFoldView = aboveTheFoldView;
-        mLogoView = logoView;
         mUiConfig = uiConfig;
         mRoot = new InnerNode();
         mSections = new SectionList(mUiDelegate, offlinePageBridge);
@@ -106,13 +99,6 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
             mRoot.addChild(mAboveTheFold);
         }
 
-        if (mLogoView == null) {
-            mLogo = null;
-        } else {
-            mLogo = new LogoItem();
-            mRoot.addChild(mLogo);
-        }
-
         mSuggestionsCarousel = suggestionsCarousel;
         if (suggestionsCarousel != null) {
             assert ChromeFeatureList.isEnabled(ChromeFeatureList.CONTEXTUAL_SUGGESTIONS_CAROUSEL);
@@ -167,9 +153,6 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
             case ItemViewType.ABOVE_THE_FOLD:
                 return new NewTabPageViewHolder(mAboveTheFoldView);
 
-            case ItemViewType.LOGO:
-                return new NewTabPageViewHolder(mLogoView);
-
             case ItemViewType.SITE_SECTION:
                 return SiteSection.createViewHolder(
                         SiteSection.inflateSiteSection(parent), mUiConfig);
@@ -379,15 +362,6 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
         mRoot.dismissItem(position, itemRemovedCallback);
     }
 
-    /**
-     * Sets the visibility of the logo.
-     * @param visible Whether the logo should be visible.
-     */
-    public void setLogoVisibility(boolean visible) {
-        assert mLogo != null;
-        mLogo.setVisible(visible);
-    }
-
     /**
      * Drops all but the first {@code n} thumbnails on articles.
      * @param n The number of article thumbnails to keep.

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NodeVisitor.java

@@ -76,7 +76,7 @@ public class NodeVisitor {
     public void visitCarouselItem(SuggestionsCarouselAdapter adapter) {}
 
     /**
-     * Visits a logo.
+     * Visits a card placeholder item.
      */
-    public void visitLogo() {}
+    public void visitPlaceholderItem() {}
 }

chrome/android/java/src/org/chromium/chrome/browser/suggestions/LogoItem.java

-// Copyright 2017 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.suggestions;
-
-import org.chromium.chrome.browser.ntp.cards.ItemViewType;
-import org.chromium.chrome.browser.ntp.cards.NewTabPageViewHolder;
-import org.chromium.chrome.browser.ntp.cards.NodeVisitor;
-import org.chromium.chrome.browser.ntp.cards.OptionalLeaf;
-
-/**
- * A logo for the search engine provider.
- */
-public class LogoItem extends OptionalLeaf {
-    @Override
-    @ItemViewType
-    protected int getItemViewType() {
-        return ItemViewType.LOGO;
-    }
-
-    @Override
-    protected void onBindViewHolder(NewTabPageViewHolder holder) {}
-
-    @Override
-    public void visitOptionalItem(NodeVisitor visitor) {
-        visitor.visitLogo();
-    }
-
-    public void setVisible(boolean visible) {
-        setVisibilityInternal(visible);
-    }
-}

chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsBottomSheetContent.java

@@ -15,7 +15,6 @@ import android.view.View.OnAttachStateChangeListener;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
-import android.widget.FrameLayout;
 
 import org.chromium.base.CollectionUtil;
 import org.chromium.chrome.R;
@@ -58,7 +57,6 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
 
     private final View mView;
     private final SuggestionsRecyclerView mRecyclerView;
-    private final NewTabPageAdapter mAdapter;
     private final ContextMenuManager mContextMenuManager;
     private final SuggestionsUiDelegateImpl mSuggestionsUiDelegate;
     private final TileGroup.Delegate mTileGroupDelegate;
@@ -125,8 +123,7 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
         mToolbarHeight = resources.getDimensionPixelSize(R.dimen.bottom_control_container_height);
         mMaxToolbarOffset = resources.getDimensionPixelSize(R.dimen.ntp_logo_height)
                 + resources.getDimensionPixelSize(R.dimen.ntp_logo_margin_top_modern)
-                + resources.getDimensionPixelSize(R.dimen.ntp_logo_margin_bottom_modern)
-                - mToolbarHeight;
+                + resources.getDimensionPixelSize(R.dimen.ntp_logo_margin_bottom_modern);
 
         TouchEnabledDelegate touchEnabledDelegate = activity.getBottomSheet()::setTouchEnabled;
         mContextMenuManager = new ContextMenuManager(
@@ -147,15 +144,9 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
                           uiConfig, mSuggestionsUiDelegate, mContextMenuManager, offlinePageBridge)
                 : null;
 
-        // Inflate the logo in a container so its layout attributes are applied, then take it out.
-        FrameLayout logoContainer = (FrameLayout) LayoutInflater.from(activity).inflate(
-                R.layout.suggestions_bottom_sheet_logo, null);
-        mLogoView = logoContainer.findViewById(R.id.search_provider_logo);
-        logoContainer.removeView(mLogoView);
-
-        mAdapter = new NewTabPageAdapter(mSuggestionsUiDelegate,
-                /* aboveTheFoldView = */ null, mLogoView, uiConfig, offlinePageBridge,
-                mContextMenuManager, mTileGroupDelegate, mSuggestionsCarousel);
+        final NewTabPageAdapter adapter = new NewTabPageAdapter(mSuggestionsUiDelegate,
+                /* aboveTheFoldView = */ null, uiConfig, offlinePageBridge, mContextMenuManager,
+                mTileGroupDelegate, mSuggestionsCarousel);
 
         mBottomSheetObserver = new SuggestionsSheetVisibilityChangeObserver(this, activity) {
             @Override
@@ -168,14 +159,14 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
                 SuggestionsMetrics.recordSurfaceVisible();
 
                 if (isFirstShown) {
-                    mAdapter.refreshSuggestions();
+                    adapter.refreshSuggestions();
 
                     maybeUpdateContextualSuggestions();
 
                     // Set the adapter on the RecyclerView after updating it, to avoid sending
                     // notifications that might confuse its internal state.
                     // See https://crbug.com/756514.
-                    mRecyclerView.setAdapter(mAdapter);
+                    mRecyclerView.setAdapter(adapter);
                     mRecyclerView.scrollToPosition(0);
                     mRecyclerView.getScrollEventReporter().reset();
                 }
@@ -205,7 +196,7 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
 
                 if (ChromeFeatureList.isEnabled(
                             ChromeFeatureList.CHROME_HOME_DROP_ALL_BUT_FIRST_THUMBNAIL)) {
-                    mAdapter.dropAllButFirstNArticleThumbnails(1);
+                    adapter.dropAllButFirstNArticleThumbnails(1);
                 }
                 mRecyclerView.setAdapter(null);
                 updateLogoTransition();
@@ -230,6 +221,7 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
         mView.setOnTouchListener(touchListener);
         mRecyclerView.setOnTouchListener(touchListener);
 
+        mLogoView = mView.findViewById(R.id.search_provider_logo);
         mControlContainerView = (ViewGroup) activity.findViewById(R.id.control_container);
         mToolbarPullHandle = activity.findViewById(R.id.toolbar_handle);
         mToolbarShadow = activity.findViewById(R.id.bottom_toolbar_shadow);
@@ -328,20 +320,20 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
     @Override
     public void onNewTabShown() {
         mNewTabShown = true;
-        updateLogoVisibility();
+        updateSpacing();
     }
 
     @Override
     public void onNewTabHidden() {
         mNewTabShown = false;
-        updateLogoVisibility();
+        updateSpacing();
     }
 
     @Override
     public void onTemplateURLServiceChanged() {
         updateSearchProviderHasLogo();
         loadSearchProviderLogo();
-        updateLogoVisibility();
+        updateSpacing();
         updateLogoTransition();
     }
 
@@ -398,6 +390,8 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
 
         // If the logo is not shown, reset all transitions.
         if (!showLogo) {
+            mLogoView.setTranslationY(0);
+            mLogoView.setVisibility(View.GONE);
             mControlContainerView.setTranslationY(0);
             mToolbarPullHandle.setTranslationY(0);
             mToolbarShadow.setTranslationY(0);
@@ -426,6 +420,9 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
             mTransitionFraction = 1.0f;
         }
 
+        mLogoView.setTranslationY(-mMaxToolbarOffset * mTransitionFraction);
+        if (mLogoView.getVisibility() != View.VISIBLE) mLogoView.setVisibility(View.VISIBLE);
+
         // Transform the sheet height fraction back to pixel scale.
         float rangePx =
                 (mSheet.getFullRatio() - mSheet.getPeekRatio()) * mSheet.getSheetContainerHeight();
@@ -439,8 +436,6 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
         mToolbarPullHandle.setTranslationY(-toolbarOffset);
         mToolbarShadow.setTranslationY(-toolbarOffset);
 
-        // Fade out the whole RecyclerView when the URL bar is focused, and fade it in when it loses
-        // focus.
         final float alpha;
         if (isAnimating() && hasFocus) {
             alpha = 1.0f - mAnimator.getAnimatedFraction();
@@ -455,10 +450,9 @@ public class SuggestionsBottomSheetContent implements BottomSheet.BottomSheetCon
         mRecyclerView.setVisibility(alpha == 0.0f ? View.INVISIBLE : View.VISIBLE);
     }
 
-    private void updateLogoVisibility() {
-        boolean showLogo = shouldShowLogo();
-        mAdapter.setLogoVisibility(showLogo);
-        int top = showLogo ? 0 : mToolbarHeight;
+    private void updateSpacing() {
+        int top = mToolbarHeight;
+        if (shouldShowLogo()) top += (int) mMaxToolbarOffset;
         int left = mRecyclerView.getPaddingLeft();
         int right = mRecyclerView.getPaddingRight();
         int bottom = mRecyclerView.getPaddingBottom();

chrome/android/java_sources.gni

@@ -1070,7 +1070,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/suggestions/ContextualSuggestionsCardViewHolder.java",
   "java/src/org/chromium/chrome/browser/suggestions/DestructionObserver.java",
   "java/src/org/chromium/chrome/browser/suggestions/ImageFetcher.java",
-  "java/src/org/chromium/chrome/browser/suggestions/LogoItem.java",
   "java/src/org/chromium/chrome/browser/suggestions/MostVisitedSites.java",
   "java/src/org/chromium/chrome/browser/suggestions/MostVisitedSitesBridge.java",
   "java/src/org/chromium/chrome/browser/suggestions/SiteSection.java",

chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java

@@ -282,7 +282,7 @@ public class NewTabPageAdapterTest {
         FeatureUtilities.resetChromeHomeEnabledForTests();
 
         // Set empty variation params for the test.
-        CardsVariationParameters.setTestVariationParams(new HashMap<String, String>());
+        CardsVariationParameters.setTestVariationParams(new HashMap<>());
 
         // Initialise the sign in state. We will be signed in by default in the tests.
         assertFalse(
@@ -1259,7 +1259,7 @@ public class NewTabPageAdapterTest {
      */
     private SectionDescriptor sectionWithStatusCard() {
         assertFalse(FeatureUtilities.isChromeHomeEnabled());
-        return new SectionDescriptor(Collections.<SnippetArticle>emptyList()).withStatusCard();
+        return new SectionDescriptor(Collections.emptyList()).withStatusCard();
     }
 
     /**
@@ -1270,7 +1270,7 @@ public class NewTabPageAdapterTest {
      */
     private SectionDescriptor emptySection() {
         assertTrue(FeatureUtilities.isChromeHomeEnabled());
-        return new SectionDescriptor(Collections.<SnippetArticle>emptyList());
+        return new SectionDescriptor(Collections.emptyList());
     }
 
     private void resetUiDelegate() {
@@ -1282,8 +1282,8 @@ public class NewTabPageAdapterTest {
 
     private void reloadNtp() {
         mSource.removeObservers();
-        mAdapter = new NewTabPageAdapter(mUiDelegate, mock(View.class), /* logoView = */ null,
-                makeUiConfig(), mOfflinePageBridge, mock(ContextMenuManager.class),
+        mAdapter = new NewTabPageAdapter(mUiDelegate, mock(View.class), makeUiConfig(),
+                mOfflinePageBridge, mock(ContextMenuManager.class),
                 /* tileGroupDelegate = */ null, /* suggestionsCarousel = */ null);
         mAdapter.refreshSuggestions();
     }

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java

@@ -198,8 +198,8 @@ public final class ContentSuggestionsTestUtils {
             }
 
             @Override
-            public void visitLogo() {
-                describeItem("LOGO");
+            public void visitPlaceholderItem() {
+                describeItem("PLACEHOLDER_CARD");
             }
 
             private void describeItem(String description) {