| Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
|
| index b7cec329bd6ed8d6d4be9c633924cf52cd6a7861..80b563927ca211496203ce0564f9685447577cda 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
|
| @@ -126,7 +126,7 @@ public class ContextualSearchEventFilterTest extends InstrumentationTestCase
|
| // --------------------------------------------------------------------------------------------
|
|
|
| /**
|
| - * MockContextualSearchPanel stops creation of ContentViewCores.
|
| + * Mocks the ContextualSearchPanel, so it doesn't create ContentViewCore.
|
| */
|
| public static class MockContextualSearchPanel extends ContextualSearchPanel {
|
|
|
| @@ -154,6 +154,12 @@ public class ContextualSearchEventFilterTest extends InstrumentationTestCase
|
| @Override
|
| public void removeLastHistoryEntry(String url, long timeInMs) {}
|
| }
|
| +
|
| + @Override
|
| + protected float getPeekPromoHeight() {
|
| + // Android Views are not used in this test so we cannot get the actual height.
|
| + return 0.f;
|
| + }
|
| }
|
|
|
| // --------------------------------------------------------------------------------------------
|
|
|