Commit a3a7564a authored by bttk's avatar bttk Committed by Commit Bot

GeolocationHeaderUnitTest: remove dependency on RecordHistogramJni

This dependency breaks the refactoring of java metrics.
The refactoring is a work in progress:
https://chromium-review.googlesource.com/c/chromium/src/+/1915193

Change-Id: I3ae2cacb86d49611a4e1f4311fe227c462c965d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1926509Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarGang Wu <gangwu@chromium.org>
Commit-Queue: bttk <bttk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717687}
parent ca358725
...@@ -27,8 +27,7 @@ import org.robolectric.annotation.Config; ...@@ -27,8 +27,7 @@ import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements; import org.robolectric.annotation.Implements;
import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.test.DisableHistogramsRule;
import org.chromium.base.metrics.RecordHistogramJni;
import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.base.test.util.JniMocker; import org.chromium.base.test.util.JniMocker;
import org.chromium.chrome.browser.omnibox.geo.VisibleNetworks.VisibleCell; import org.chromium.chrome.browser.omnibox.geo.VisibleNetworks.VisibleCell;
...@@ -100,8 +99,8 @@ public class GeolocationHeaderUnitTest { ...@@ -100,8 +99,8 @@ public class GeolocationHeaderUnitTest {
@Rule @Rule
public JniMocker mocker = new JniMocker(); public JniMocker mocker = new JniMocker();
@Mock @Rule
RecordHistogram.Natives mRecordHistogramJniMock; public DisableHistogramsRule mDisableHistogramsRule = new DisableHistogramsRule();
@Mock @Mock
UrlUtilities.Natives mUrlUtilitiesJniMock; UrlUtilities.Natives mUrlUtilitiesJniMock;
...@@ -115,7 +114,6 @@ public class GeolocationHeaderUnitTest { ...@@ -115,7 +114,6 @@ public class GeolocationHeaderUnitTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mocker.mock(RecordHistogramJni.TEST_HOOKS, mRecordHistogramJniMock);
mocker.mock(UrlUtilitiesJni.TEST_HOOKS, mUrlUtilitiesJniMock); mocker.mock(UrlUtilitiesJni.TEST_HOOKS, mUrlUtilitiesJniMock);
mocker.mock(WebsitePreferenceBridgeJni.TEST_HOOKS, mWebsitePreferenceBridgeJniMock); mocker.mock(WebsitePreferenceBridgeJni.TEST_HOOKS, mWebsitePreferenceBridgeJniMock);
GeolocationTracker.setLocationAgeForTesting(null); GeolocationTracker.setLocationAgeForTesting(null);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment