[Home] Toolbar shadow v1

chrome/test/android/javatests/src/org/chromium/chrome/test/BottomSheetTestCaseBase.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.test;
 
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_PHONE;
 
 import android.support.v7.widget.RecyclerView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetContentController;
 import org.chromium.chrome.test.util.browser.RecyclerViewTestUtils;
 
 /**
  * Base class for instrumentation tests using the bottom sheet.
  */
 @CommandLineFlags.Add({"enable-features=ChromeHome"})
@@ skipping 20 matching lines @@
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 getActivity().getBottomSheet().setSheetState(
                         BottomSheet.SHEET_STATE_FULL, /* animate = */ false);
             }
         });
         // The default BottomSheetContent is SuggestionsBottomSheetContent, whose content view is a
         // RecyclerView.
         RecyclerViewTestUtils.waitForStableRecyclerView(
-                ((RecyclerView) getBottomSheetContent().getContentView()));
+                ((RecyclerView) getBottomSheetContent().getContentView().findViewById(
+                        R.id.recycler_view)));
 
         mBottomSheet = getActivity().getBottomSheet();
         mBottomSheetContentController = getActivity().getBottomSheetContentController();
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 
@@ skipping 40 matching lines @@
      */
     protected void selectBottomSheetContent(final int itemId) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mBottomSheetContentController.selectItemForTests(itemId);
             }
         });
     }
 }