Commit 5a169a41 authored by Brandon Wylie's avatar Brandon Wylie Committed by Commit Bot

Fix test failure in LocationBarVoiceRecognitionHandlerTest

TBR=tedchoc@chromium.org

Bug: 1046900
Change-Id: Ib43d2936c0f7a068ecc3e5a2dd2332c877c783f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2029450Reviewed-by: default avatarBrandon Wylie <wylieb@chromium.org>
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736673}
parent 81ada53a
...@@ -485,11 +485,16 @@ public class LocationBarVoiceRecognitionHandlerTest { ...@@ -485,11 +485,16 @@ public class LocationBarVoiceRecognitionHandlerTest {
mWindowAndroid.setAndroidPermissionDelegate(mPermissionDelegate); mWindowAndroid.setAndroidPermissionDelegate(mPermissionDelegate);
mTab = new MockTab(0, false); mTab = new MockTab(0, false);
}); });
TemplateUrlService service = Mockito.mock(TemplateUrlService.class);
doReturn(true).when(service).isDefaultSearchEngineGoogle();
TemplateUrlServiceFactory.setInstanceForTesting(service);
} }
@After @After
public void tearDown() { public void tearDown() {
SysUtils.resetForTesting(); SysUtils.resetForTesting();
TemplateUrlServiceFactory.setInstanceForTesting(null);
} }
/** /**
...@@ -572,10 +577,6 @@ public class LocationBarVoiceRecognitionHandlerTest { ...@@ -572,10 +577,6 @@ public class LocationBarVoiceRecognitionHandlerTest {
doReturn(testPackageManager).when(testActivity).getPackageManager(); doReturn(testPackageManager).when(testActivity).getPackageManager();
mWindowAndroid.setActivity(testActivity); mWindowAndroid.setActivity(testActivity);
TemplateUrlService service = Mockito.mock(TemplateUrlService.class);
doReturn(true).when(service).isDefaultSearchEngineGoogle();
TemplateUrlServiceFactory.setInstanceForTesting(service);
doReturn(true).when(mExternalAuthUtils).isGoogleSigned(IntentHandler.PACKAGE_GSA); doReturn(true).when(mExternalAuthUtils).isGoogleSigned(IntentHandler.PACKAGE_GSA);
SysUtils.setAmountOfPhysicalMemoryKBForTesting( SysUtils.setAmountOfPhysicalMemoryKBForTesting(
......
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