[List UI Unification] Basic list unification for phones

chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.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.history;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
@@ skipping 353 matching lines @@
 
         // Check that the item's remove button visibilty is set correctly after signing out.
         assertEquals(View.INVISIBLE, item.findViewById(R.id.remove).getVisibility());
         toggleItemSelection(2);
         assertFalse(mHistoryManager.getSelectionDelegateForTests().isSelectionEnabled());
         assertEquals(View.VISIBLE, item.findViewById(R.id.remove).getVisibility());
     }
 
     @SmallTest
     public void testToolbarShadow() throws Exception {
-        View toolbarShadow = mHistoryManager.getToolbarShadowForTests();
+        View toolbarShadow = mHistoryManager.getSelectableListLayout().getToolbarShadowForTests();
         assertEquals(View.GONE, toolbarShadow.getVisibility());
 
         toggleItemSelection(2);
         assertTrue(mHistoryManager.getSelectionDelegateForTests().isSelectionEnabled());
         assertEquals(View.VISIBLE, toolbarShadow.getVisibility());
 
         toggleItemSelection(2);
         assertFalse(mHistoryManager.getSelectionDelegateForTests().isSelectionEnabled());
         assertEquals(View.GONE, toolbarShadow.getVisibility());
     }
 
     @SmallTest
     public void testSearchView() throws Exception {
         final HistoryManagerToolbar toolbar = mHistoryManager.getToolbarForTests();
-        View toolbarShadow = mHistoryManager.getToolbarShadowForTests();
+        View toolbarShadow = mHistoryManager.getSelectableListLayout().getToolbarShadowForTests();
         View toolbarSearchView = toolbar.getSearchViewForTests();
         assertEquals(View.GONE, toolbarShadow.getVisibility());
         assertEquals(View.GONE, toolbarSearchView.getVisibility());
 
         toggleItemSelection(2);
         assertTrue(mHistoryManager.getSelectionDelegateForTests().isSelectionEnabled());
 
         int callCount = mTestObserver.onSelectionCallback.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ skipping 156 matching lines @@
 
         // Remove observer
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 SigninManager.get(getActivity()).removeSignInStateObserver(mTestObserver);
             }
         });
     }
 }