From dd3a51e0e5a3c9555590770caf0ebcec8c2ee8bd Mon Sep 17 00:00:00 2001 From: Peter Wen Date: Wed, 15 Nov 2017 18:59:42 +0000 Subject: [PATCH] Android: Add missing @Override annotations This fixes errorprone MissingOverride warnings. Used '-XepPatchChecks:MissingOverride' and '-XepPatchLocation:IN_PLACE' to automatically add the annotations. TBR for cross-repo refactoring. BUG=775031 TBR=torne@chromium.org,sdefresne@chromium.org,rockot@chromium.org,xunjieli@chromium.org Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win10_chromium_x64_rel_ng Change-Id: I2fd028dcf6ab9fdf5ea1e2dab2215a52dffe8b21 Reviewed-on: https://chromium-review.googlesource.com/766516 Commit-Queue: Peter Wen Reviewed-by: Xi Han Reviewed-by: agrieve Reviewed-by: Yaron Friedman Reviewed-by: Lambros Lambrou Cr-Commit-Position: refs/heads/master@{#516770} --- .../webview_shell/WebViewBrowserActivity.java | 9 +++++++++ .../process_launcher/ChildProcessConnectionTest.java | 1 + .../test/BaseActivityInstrumentationTestCase.java | 2 ++ .../test/util/MinAndroidSdkLevelSkipCheckTest.java | 5 ++++- .../base/test/util/RestrictionSkipCheckTest.java | 4 +++- .../browser/media/router/ChromeMediaRouter.java | 1 + .../chrome/browser/photo_picker/DecoderService.java | 1 + .../browser/photo_picker/DecoderServiceHost.java | 2 ++ .../physicalweb/PhysicalWebShareEntryActivity.java | 2 ++ .../chrome/browser/widget/ThumbnailDiskStorage.java | 2 ++ .../org/chromium/chrome/browser/WebShareTest.java | 12 ++++++++++++ .../browser/crash/MinidumpUploadServiceTest.java | 2 ++ .../feature_engagement/ScreenshotMonitorTest.java | 1 + .../ClearBrowsingDataPreferencesBasicTest.java | 1 + .../chromium/chrome/browser/AppIndexingUtilTest.java | 3 ++- .../compositor/CompositorSurfaceManagerTest.java | 2 ++ .../media/router/cast/CastMessageHandlerTest.java | 12 +++++++----- .../media/router/cast/DiscoveryCallbackTest.java | 10 ++++++---- .../media/ui/MediaNotificationFaviconTest.java | 1 + .../media/ui/MediaNotificationManagerTestBase.java | 1 + .../offlinepages/OfflinePageBridgeUnitTest.java | 1 + .../prefetch/PrefetchBackgroundTaskUnitTest.java | 1 + .../privacy/PrivacyPreferencesManagerTest.java | 1 + .../lib/runtime_library/WebApkServiceImpl.java | 1 + .../android/webapk/shell_apk/shell_apk_version.gni | 2 +- .../chromium/webapk/shell_apk/IdentityService.java | 1 + .../chrome/test/MultiActivityTestCommon.java | 1 + .../BackgroundTaskSchedulerPrefs.java | 1 + .../BackgroundTaskSchedulerUma.java | 1 + .../invalidation/InvalidationClientServiceTest.java | 1 + .../minidump_uploader/MinidumpUploaderImplTest.java | 2 ++ .../device/geolocation/LocationProviderTest.java | 3 +++ .../chromium/device/vr/NonPresentingGvrContext.java | 2 ++ .../net/test/util/NetworkChangeNotifierTestUtil.java | 1 + .../chromoting/ChromotingDownloadManager.java | 1 + .../java/src/org/chromium/chromoting/Desktop.java | 2 ++ .../java/src/org/chromium/chromoting/Event.java | 1 + .../accountswitcher/AccountSwitcherBasic.java | 1 + .../java/src/org/chromium/chromoting/jni/Client.java | 5 +++++ .../junit/src/org/chromium/device/nfc/NFCTest.java | 2 ++ .../shape_detection/BarcodeDetectionImplTest.java | 1 + .../shape_detection/FaceDetectionImplTest.java | 1 + .../shape_detection/TextDetectionImplTest.java | 1 + .../test/support/RobotiumBundleGenerator.java | 2 ++ .../testing/local/BackgroundShadowAsyncTask.java | 2 ++ .../testing/local/CustomShadowAsyncTask.java | 1 + .../org/chromium/testing/local/GtestComputer.java | 3 +++ .../chromium/test/reporter/TestStatusListener.java | 1 + 48 files changed, 104 insertions(+), 13 deletions(-) diff --git a/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java index f4f1ed34432037..d6342209ab6588 100644 --- a/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java +++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java @@ -114,20 +114,24 @@ public GeoPermissionRequest(String origin, GeolocationPermissions.Callback callb mCallback = callback; } + @Override public Uri getOrigin() { return Uri.parse(mOrigin); } + @Override public String[] getResources() { return new String[] { WebViewBrowserActivity.RESOURCE_GEO }; } + @Override public void grant(String[] resources) { assert resources.length == 1; assert WebViewBrowserActivity.RESOURCE_GEO.equals(resources[0]); mCallback.invoke(mOrigin, true, false); } + @Override public void deny() { mCallback.invoke(mOrigin, false, false); } @@ -143,14 +147,17 @@ public FilePermissionRequest(String origin) { mOrigin = origin; } + @Override public Uri getOrigin() { return Uri.parse(mOrigin); } + @Override public String[] getResources() { return new String[] { WebViewBrowserActivity.RESOURCE_FILE_URL }; } + @Override public void grant(String[] resources) { assert resources.length == 1; assert WebViewBrowserActivity.RESOURCE_FILE_URL.equals(resources[0]); @@ -158,6 +165,7 @@ public void grant(String[] resources) { WebViewBrowserActivity.this.mWebView.loadUrl(mOrigin); } + @Override public void deny() { // womp womp } @@ -172,6 +180,7 @@ public void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_webview_browser); mUrlBar = (EditText) findViewById(R.id.url_field); mUrlBar.setOnKeyListener(new OnKeyListener() { + @Override public boolean onKey(View view, int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) { loadUrlFromUrlBar(view); diff --git a/base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java b/base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java index 3c6dd3e4f9d557..c707192e004d4d 100644 --- a/base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java +++ b/base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java @@ -87,6 +87,7 @@ public Intent getBindIntent() { private final ChildProcessConnection.ChildServiceConnectionFactory mServiceConnectionFactory = new ChildProcessConnection.ChildServiceConnectionFactory() { + @Override public ChildProcessConnection.ChildServiceConnection createConnection( Intent bindIntent, int bindFlags, ChildProcessConnection.ChildServiceConnectionDelegate delegate) { diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseActivityInstrumentationTestCase.java b/base/test/android/javatests/src/org/chromium/base/test/BaseActivityInstrumentationTestCase.java index 246af6bbcb49ef..828f3d49b5ad40 100644 --- a/base/test/android/javatests/src/org/chromium/base/test/BaseActivityInstrumentationTestCase.java +++ b/base/test/android/javatests/src/org/chromium/base/test/BaseActivityInstrumentationTestCase.java @@ -24,11 +24,13 @@ public BaseActivityInstrumentationTestCase(Class activityClass) { super(activityClass); } + @Override @CallSuper protected void setUp() throws Exception { super.setUp(); } + @Override @CallSuper protected void tearDown() throws Exception { super.tearDown(); diff --git a/base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java b/base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java index f1c57d082a1b24..b254bd936e136d 100644 --- a/base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java +++ b/base/test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java @@ -6,12 +6,13 @@ import junit.framework.TestCase; -import org.chromium.testing.local.LocalRobolectricTestRunner; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; +import org.chromium.testing.local.LocalRobolectricTestRunner; + /** Unit tests for MinAndroidSdkLevelSkipCheck. */ @RunWith(LocalRobolectricTestRunner.class) @Config(manifest = Config.NONE, sdk = 18) @@ -45,6 +46,7 @@ private static class ExtendsMin17Class extends Min17Class { public ExtendsMin17Class(String name) { super(name); } + @Override public void unannotatedMethod() {} } @@ -52,6 +54,7 @@ private static class ExtendsMin20Class extends Min20Class { public ExtendsMin20Class(String name) { super(name); } + @Override public void unannotatedMethod() {} } diff --git a/base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java b/base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java index 0b4a9b895cf095..f64976a763d948 100644 --- a/base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java +++ b/base/test/android/junit/src/org/chromium/base/test/util/RestrictionSkipCheckTest.java @@ -11,7 +11,6 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; - import org.robolectric.annotation.Config; import org.chromium.testing.local.LocalRobolectricTestRunner; @@ -30,6 +29,7 @@ private static class TestRestrictionSkipCheck extends RestrictionSkipCheck { public TestRestrictionSkipCheck() { super(null); } + @Override protected boolean restrictionApplies(String restriction) { return TextUtils.equals(restriction, TEST_RESTRICTION_APPLIES); } @@ -73,6 +73,7 @@ private static class ExtendsRestrictedClass extends RestrictedClass { public ExtendsRestrictedClass(String name) { super(name); } + @Override public void unannotatedMethod() {} } @@ -80,6 +81,7 @@ private static class ExtendsUnrestrictedClass extends UnrestrictedClass { public ExtendsUnrestrictedClass(String name) { super(name); } + @Override public void unannotatedMethod() {} } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java index 87a4ff3af505ad..b9df3623f11758 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java @@ -35,6 +35,7 @@ public class ChromeMediaRouter implements MediaRouteManager { private static MediaRouteProvider.Factory sRouteProviderFactory = new MediaRouteProvider.Factory() { + @Override public void addProviders(MediaRouteManager manager) { MediaRouteProvider castProvider = CastMediaRouteProvider.create(manager); manager.addMediaRouteProvider(castProvider); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java index 8b37705f2e5074..e27b502f504c05 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java @@ -68,6 +68,7 @@ public IBinder onBind(Intent intent) { } private final IDecoderService.Stub mBinder = new IDecoderService.Stub() { + @Override public void decodeImage(Bundle payload, IDecoderServiceCallback callback) { Bundle bundle = null; String filePath = ""; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java index d4021e9b3ca4a7..8b92d07382cdde 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java @@ -44,6 +44,7 @@ public class DecoderServiceHost extends IDecoderServiceCallback.Stub { IDecoderService mIRemoteService; private ServiceConnection mConnection = new ServiceConnection() { + @Override public void onServiceConnected(ComponentName className, IBinder service) { mIRemoteService = IDecoderService.Stub.asInterface(service); mBound = true; @@ -52,6 +53,7 @@ public void onServiceConnected(ComponentName className, IBinder service) { } } + @Override public void onServiceDisconnected(ComponentName className) { Log.e(TAG, "Service has unexpectedly disconnected"); mIRemoteService = null; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareEntryActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareEntryActivity.java index 17400d4a160735..1b10b1e2f3ac09 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareEntryActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebShareEntryActivity.java @@ -38,6 +38,7 @@ protected void onCreate(Bundle savedInstanceState) { .setMessage(R.string.physical_web_share_entry_message) .setPositiveButton(R.string.continue_button, new DialogInterface.OnClickListener() { + @Override public void onClick(DialogInterface dialog, int which) { PhysicalWeb.setSharingOptedIn(); PhysicalWebBroadcastService.startBroadcastService(url); @@ -46,6 +47,7 @@ public void onClick(DialogInterface dialog, int which) { }) .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + @Override public void onClick(DialogInterface dialog, int which) { finish(); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java index e036be00955cb2..1326a8db2db111 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java @@ -79,6 +79,7 @@ public class ThumbnailDiskStorage implements ThumbnailGeneratorCallback { long mSizeBytes; private class InitTask extends AsyncTask { + @Override protected Void doInBackground(Void... params) { initDiskCache(); return null; @@ -86,6 +87,7 @@ protected Void doInBackground(Void... params) { } private class ClearTask extends AsyncTask { + @Override protected Void doInBackground(Void... params) { clearDiskCache(); return null; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/WebShareTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/WebShareTest.java index ae3f0823a7328a..5f9d399ace5096 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/WebShareTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/WebShareTest.java @@ -128,10 +128,13 @@ public void testWebShareCancel() throws Exception { // Set up ShareHelper to ignore the intent (without showing a picker). This simulates the // user canceling the dialog. ShareHelper.setFakeIntentReceiverForTesting(new ShareHelper.FakeIntentReceiver() { + @Override public void setIntentToSendBack(Intent intent) {} + @Override public void onCustomChooserShown(AlertDialog dialog) {} + @Override public void fireIntent(Context context, Intent intent) { // Click again to start another share. This is necessary to work around // https://crbug.com/636274 (callback is not canceled until next share is @@ -161,12 +164,15 @@ public void testWebShareSuccess() throws Exception { ShareHelper.setFakeIntentReceiverForTesting(new ShareHelper.FakeIntentReceiver() { private Intent mIntentToSendBack; + @Override public void setIntentToSendBack(Intent intent) { mIntentToSendBack = intent; } + @Override public void onCustomChooserShown(AlertDialog dialog) {} + @Override public void fireIntent(Context context, Intent intent) { mReceivedIntent = intent; @@ -210,13 +216,16 @@ public void fireIntent(Context context, Intent intent) { @Feature({"WebShare"}) public void testWebShareCancelPreLMR1() throws Exception { ShareHelper.setFakeIntentReceiverForTesting(new ShareHelper.FakeIntentReceiver() { + @Override public void setIntentToSendBack(Intent intent) {} + @Override public void onCustomChooserShown(AlertDialog dialog) { // Cancel the chooser dialog. dialog.dismiss(); } + @Override public void fireIntent(Context context, Intent intent) {} }); @@ -240,8 +249,10 @@ public void fireIntent(Context context, Intent intent) {} @Feature({"WebShare"}) public void testWebShareSuccessPreLMR1() throws Exception { ShareHelper.setFakeIntentReceiverForTesting(new ShareHelper.FakeIntentReceiver() { + @Override public void setIntentToSendBack(Intent intent) {} + @Override public void onCustomChooserShown(AlertDialog dialog) { // Click on an app (it doesn't matter which, because we will hook the intent). assert dialog.getListView().getCount() > 0; @@ -250,6 +261,7 @@ public void onCustomChooserShown(AlertDialog dialog) { .performItemClick(null, 0, dialog.getListView().getItemIdAtPosition(0)); } + @Override public void fireIntent(Context context, Intent intent) { mReceivedIntent = intent; } diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java index 038c8929543549..bf401652a51239 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java @@ -72,6 +72,7 @@ private void attachBaseContextLate(Context base) { private static class NetworkChangingPermissionManager extends MockCrashReportingPermissionManager { + @Override public boolean isNetworkAvailableForCrashUploads() { return mIsNetworkAvailable; } @@ -81,6 +82,7 @@ public void setIsNetworkAvailableForCrashUploads(boolean networkAvailable) { } } + @Override CrashReportingPermissionManager getCrashReportingPermissionManager() { return mPermissionManager; } diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorTest.java index 061da82a11e0b2..a29820e739e7f6 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorTest.java @@ -61,6 +61,7 @@ static class TestScreenshotMonitorDelegate implements ScreenshotMonitorDelegate // This is modified on the UI thread and accessed on the test thread. public final AtomicInteger screenshotShowUiCount = new AtomicInteger(); + @Override public void onScreenshotTaken() { Assert.assertTrue(ThreadUtils.runningOnUiThread()); screenshotShowUiCount.getAndIncrement(); diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasicTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasicTest.java index af8382788d3431..f454521ade0ce0 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasicTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasicTest.java @@ -71,6 +71,7 @@ private static class StubProfileSyncService extends ProfileSyncService { mSyncable = syncable; } + @Override public Set getActiveDataTypes() { if (mSyncable) { return CollectionUtil.newHashSet(ModelType.HISTORY_DELETE_DIRECTIVES); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/AppIndexingUtilTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/AppIndexingUtilTest.java index ecda0a7d16000b..994f0604ec93f6 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/AppIndexingUtilTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/AppIndexingUtilTest.java @@ -17,7 +17,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; - import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; @@ -61,6 +60,7 @@ public void setUp() { doReturn("My neat website").when(mTab).getTitle(); doReturn(0L).when(mUtil).getElapsedTime(); doAnswer(new Answer() { + @Override public Void answer(InvocationOnMock invocation) { CopylessPaste.GetEntitiesResponse callback = (CopylessPaste.GetEntitiesResponse) invocation.getArguments()[0]; @@ -108,6 +108,7 @@ public void testCacheHit_expired() { @Test public void testCacheHit_noEntity() { doAnswer(new Answer() { + @Override public Void answer(InvocationOnMock invocation) { CopylessPaste.GetEntitiesResponse callback = (CopylessPaste.GetEntitiesResponse) invocation.getArguments()[0]; diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerTest.java index 8d4e4102c1eb8e..0c7b56eb11849b 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerTest.java @@ -85,6 +85,7 @@ public boolean isValid() { private int mFormat = PixelFormat.UNKNOWN; private final MyFakeSurface mSurface = new MyFakeSurface(); + @Override @Implementation public void setFormat(int format) { mFormat = format; @@ -107,6 +108,7 @@ public MyFakeSurface getFakeSurface() { public MyShadowSurfaceView() {} + @Override @Implementation public SurfaceHolder getHolder() { return getMyFakeSurfaceHolder(); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java index 51eb5507c575f5..416f285382ec08 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/CastMessageHandlerTest.java @@ -88,11 +88,13 @@ public void setUp() { clientIds.add(CLIENT_ID1); clientIds.add(CLIENT_ID2); doAnswer(new Answer() { - public Object answer(InvocationOnMock invocation) { - return clientIds; - } - }) - .when(mRouteProvider).getClients(); + @Override + public Object answer(InvocationOnMock invocation) { + return clientIds; + } + }) + .when(mRouteProvider) + .getClients(); doNothing().when(mRouteProvider).onMessage(anyString(), anyString()); doNothing().when(mRouteProvider).onMessageSentResult(anyBoolean(), anyInt()); } diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java index 3f2f62609b2c27..1787273b767447 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/cast/DiscoveryCallbackTest.java @@ -17,15 +17,16 @@ import android.support.v7.media.MediaRouteSelector; import android.support.v7.media.MediaRouter; -import org.chromium.base.test.util.Feature; -import org.chromium.chrome.browser.media.router.ChromeMediaRouterTestBase; -import org.chromium.chrome.browser.media.router.DiscoveryDelegate; -import org.chromium.testing.local.LocalRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; +import org.chromium.base.test.util.Feature; +import org.chromium.chrome.browser.media.router.ChromeMediaRouterTestBase; +import org.chromium.chrome.browser.media.router.DiscoveryDelegate; +import org.chromium.testing.local.LocalRobolectricTestRunner; + import java.util.ArrayList; import java.util.List; @@ -37,6 +38,7 @@ public class DiscoveryCallbackTest extends ChromeMediaRouterTestBase { protected DiscoveryDelegate mDiscoveryDelegate; + @Override @Before public void setUp() { super.setUp(); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java index 497b61bb4970e0..e780414401a811 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java @@ -56,6 +56,7 @@ public void setUp() { mTabHolder = new MediaNotificationTestTabHolder(TAB_ID_1, "about:blank", "title1"); } + @Override @After public void tearDown() { CommandLine.reset(); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java index 4718575dbac6c8..f9648151ad8ecd 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java @@ -177,6 +177,7 @@ private void ensureService() { mService = spy(new MockListenerService()); doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock invocation) { mService.onDestroy(); mService = null; diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeUnitTest.java index 7891e235374723..2c5a32bf49d559 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeUnitTest.java @@ -83,6 +83,7 @@ public class MockOfflinePageModelObserver extends OfflinePageModelObserver { public long lastDeletedOfflineId; public ClientId lastDeletedClientId; + @Override public void offlinePageDeleted(DeletedPageInfo deletedPage) { lastDeletedOfflineId = deletedPage.getOfflineId(); lastDeletedClientId = deletedPage.getClientId(); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskUnitTest.java index 631693455bb7cd..51cfb3dc0c96cf 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskUnitTest.java @@ -120,6 +120,7 @@ public Void answer(InvocationOnMock invocation) { ChromeBrowserInitializer.setForTesting(mChromeBrowserInitializer); doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock invocation) { mPrefetchBackgroundTask.setNativeTask(1); return Boolean.TRUE; diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java index f64216f030ba98..831d4b1147c231 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java @@ -106,6 +106,7 @@ private static class TestPrivacyPreferencesManager extends PrivacyPreferencesMan } // Stub out this call, as it could otherwise call into native code. + @Override public void syncUsageAndCrashReportingPrefs() {} } } diff --git a/chrome/android/webapk/libs/runtime_library/src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java b/chrome/android/webapk/libs/runtime_library/src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java index c55690110b76d4..17431fae86cc14 100644 --- a/chrome/android/webapk/libs/runtime_library/src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java +++ b/chrome/android/webapk/libs/runtime_library/src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java @@ -73,6 +73,7 @@ public void cancelNotification(String platformTag, int platformID) { getNotificationManager().cancel(platformTag, platformID); } + @Override public boolean notificationPermissionEnabled() { return NotificationManagerCompat.from(mContext).areNotificationsEnabled(); } diff --git a/chrome/android/webapk/shell_apk/shell_apk_version.gni b/chrome/android/webapk/shell_apk/shell_apk_version.gni index 0b9f0f03d3a2b5..e77cf32b077fa6 100644 --- a/chrome/android/webapk/shell_apk/shell_apk_version.gni +++ b/chrome/android/webapk/shell_apk/shell_apk_version.gni @@ -6,7 +6,7 @@ # (including AndroidManifest.xml) is updated. This version should be incremented # prior to uploading a new ShellAPK to the WebAPK Minting Server. # Does not affect Chrome.apk -template_shell_apk_version = 33 +template_shell_apk_version = 34 # The ShellAPK version expected by Chrome. Chrome will try to update the WebAPK # if the WebAPK's ShellAPK version is less than |expected_shell_apk_version|. diff --git a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/IdentityService.java b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/IdentityService.java index 2204431a7306a9..880cb12c432b36 100644 --- a/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/IdentityService.java +++ b/chrome/android/webapk/shell_apk/src/org/chromium/webapk/shell_apk/IdentityService.java @@ -14,6 +14,7 @@ /** IdentityService allows browsers to query information about the WebAPK. */ public class IdentityService extends Service { private final IIdentityService.Stub mBinder = new IIdentityService.Stub() { + @Override public String getRuntimeHostBrowserPackageName() { StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); try { diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestCommon.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestCommon.java index 9fec70d866173c..c9abdfe325dae1 100644 --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestCommon.java +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestCommon.java @@ -72,6 +72,7 @@ private void waitForTabCreation(ChromeActivity activity) throws InterruptedException, TimeoutException { final CallbackHelper newTabCreatorHelper = new CallbackHelper(); activity.getTabModelSelector().addObserver(new EmptyTabModelSelectorObserver() { + @Override public void onNewTabCreated(Tab tab) { newTabCreatorHelper.notifyCalled(); } diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerPrefs.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerPrefs.java index 6100ea84b51c88..62e0cc8c59503d 100644 --- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerPrefs.java +++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerPrefs.java @@ -66,6 +66,7 @@ public ScheduledTaskPreferenceEntry(String className, int taskId) { * Converts a task info to a shared preference entry in the format: * BACKGROUND_TASK_CLASS_NAME:TASK_ID. */ + @Override public String toString() { return mBackgroundTaskClass + ENTRY_SEPARATOR + mTaskId; } diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java index 2b9928da9b12cf..4ba242a98dcb06 100644 --- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java +++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java @@ -81,6 +81,7 @@ public CachedUmaEntry(String event, int value, int count) { } /** Converts cached UMA entry to a string in format: EVENT:VALUE:COUNT. */ + @Override public String toString() { return mEvent + SEPARATOR + mValue + SEPARATOR + mCount; } diff --git a/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java index 24c53270f55d86..95e27f40ad0344 100644 --- a/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java +++ b/components/invalidation/impl/android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java @@ -83,6 +83,7 @@ public ComponentName startService(Intent intent) { setupService(); } + @Override @After public void tearDown() throws Exception { if (InvalidationClientService.getIsClientStartedForTest()) { diff --git a/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderImplTest.java b/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderImplTest.java index 8a202142b70872..4fc2d37b71379b 100644 --- a/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderImplTest.java +++ b/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderImplTest.java @@ -345,6 +345,7 @@ public StallingHttpUrlConnectionFactory(CountDownLatch stopStallingLatch, boolea mSucceed = succeed; } + @Override public HttpURLConnection createHttpURLConnection(String url) { try { return new MinidumpUploadCallableTest.TestHttpURLConnection(new URL(url)) { @@ -360,6 +361,7 @@ public OutputStream getOutputStream() { } private static class FailingHttpUrlConnectionFactory implements HttpURLConnectionFactory { + @Override public HttpURLConnection createHttpURLConnection(String url) { return null; } diff --git a/device/geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java b/device/geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java index e69712b62b93e1..035f83681e5c25 100644 --- a/device/geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java +++ b/device/geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java @@ -148,6 +148,7 @@ private void setLocationProviderGmsCore() { mGoogleApiClient = Mockito.mock(GoogleApiClient.class); mGoogleApiClientIsConnected = false; doAnswer(new Answer() { + @Override public Boolean answer(InvocationOnMock invocation) { return mGoogleApiClientIsConnected; } @@ -156,6 +157,7 @@ public Boolean answer(InvocationOnMock invocation) { .isConnected(); doAnswer(new Answer() { + @Override public Void answer(InvocationOnMock invocation) { mGoogleApiClientIsConnected = true; return null; @@ -165,6 +167,7 @@ public Void answer(InvocationOnMock invocation) { .connect(); doAnswer(new Answer() { + @Override public Void answer(InvocationOnMock invocation) { mGoogleApiClientIsConnected = false; return null; diff --git a/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java b/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java index a621b0b5fabedd..d739f802e45c6b 100644 --- a/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java +++ b/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java @@ -69,8 +69,10 @@ private void shutdown() { mNativeGvrDevice = 0; } + @Override public void onRotationChanged(int rotation) {} + @Override public void onDIPScaleChanged(float dipScale) { mGvrApi.refreshDisplayMetrics(); if (mNativeGvrDevice != 0) { diff --git a/net/test/android/javatests/src/org/chromium/net/test/util/NetworkChangeNotifierTestUtil.java b/net/test/android/javatests/src/org/chromium/net/test/util/NetworkChangeNotifierTestUtil.java index 840e62afcac173..3a03f1a0782f2c 100644 --- a/net/test/android/javatests/src/org/chromium/net/test/util/NetworkChangeNotifierTestUtil.java +++ b/net/test/android/javatests/src/org/chromium/net/test/util/NetworkChangeNotifierTestUtil.java @@ -17,6 +17,7 @@ public class NetworkChangeNotifierTestUtil { */ public static void flushUiThreadTaskQueue() throws Exception { FutureTask task = new FutureTask(new Runnable() { + @Override public void run() {} }, null); ThreadUtils.postOnUiThread(task); diff --git a/remoting/android/java/src/org/chromium/chromoting/ChromotingDownloadManager.java b/remoting/android/java/src/org/chromium/chromoting/ChromotingDownloadManager.java index 61de70b12fff98..5705f80f0bd1af 100644 --- a/remoting/android/java/src/org/chromium/chromoting/ChromotingDownloadManager.java +++ b/remoting/android/java/src/org/chromium/chromoting/ChromotingDownloadManager.java @@ -75,6 +75,7 @@ public void download() { if (mUnfinishedDownloadIds.isEmpty()) { mActivity.runOnUiThread(new Runnable() { + @Override public void run() { mCallback.onBatchDownloadComplete(); } diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java index b558847a47cbed..c867f24f1ab589 100644 --- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java +++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java @@ -147,6 +147,7 @@ public void onCreate(Bundle savedInstanceState) { // Suspend the ActionBar timer when the user interacts with the options menu. getSupportActionBar().addOnMenuVisibilityListener(new OnMenuVisibilityListener() { + @Override public void onMenuVisibilityChanged(boolean isVisible) { if (isVisible) { stopActionBarAutoHideTimer(); @@ -383,6 +384,7 @@ private void setUpAutoHideToolbar() { } mActionBarAutoHideTask = new Runnable() { + @Override public void run() { if (!mToolbar.isOverflowMenuShowing()) { hideSystemUi(); diff --git a/remoting/android/java/src/org/chromium/chromoting/Event.java b/remoting/android/java/src/org/chromium/chromoting/Event.java index 3957d7c54583c8..1002a7e1d510a3 100644 --- a/remoting/android/java/src/org/chromium/chromoting/Event.java +++ b/remoting/android/java/src/org/chromium/chromoting/Event.java @@ -144,6 +144,7 @@ private SelfRemovableParameterRunnable(Event owner, Preconditions.notNull(mEvent); } + @Override public final void run(ParamT p) { synchronized (mLock) { if (mOwner.contains(mEvent)) { diff --git a/remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcherBasic.java b/remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcherBasic.java index 07e0e632d17236..be1b5d8a96e73e 100644 --- a/remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcherBasic.java +++ b/remoting/android/java/src/org/chromium/chromoting/accountswitcher/AccountSwitcherBasic.java @@ -75,6 +75,7 @@ public AccountSwitcherBasic(Activity activity, Callback callback) { mAccountName = (TextView) mAccountsUi.findViewById(R.id.account_name); Button chooseAccount = (Button) mAccountsUi.findViewById(R.id.choose_account); chooseAccount.setOnClickListener(new View.OnClickListener() { + @Override public void onClick(View v) { onChooseAccount(); } diff --git a/remoting/android/java/src/org/chromium/chromoting/jni/Client.java b/remoting/android/java/src/org/chromium/chromoting/jni/Client.java index e98718d59b6071..b7c56befd9c390 100644 --- a/remoting/android/java/src/org/chromium/chromoting/jni/Client.java +++ b/remoting/android/java/src/org/chromium/chromoting/jni/Client.java @@ -174,6 +174,7 @@ void commitPairingCredentials(String host, String id, String secret) { /** * Moves the mouse cursor, possibly while clicking the specified (nonnegative) button. */ + @Override public void sendMouseEvent(int x, int y, int whichButton, boolean buttonDown) { if (!mConnected) { return; @@ -183,6 +184,7 @@ public void sendMouseEvent(int x, int y, int whichButton, boolean buttonDown) { } /** Injects a mouse-wheel event with delta values. */ + @Override public void sendMouseWheelEvent(int deltaX, int deltaY) { if (!mConnected) { return; @@ -195,6 +197,7 @@ public void sendMouseWheelEvent(int deltaX, int deltaY) { * Presses or releases the specified key. If scanCode is not zero then * keyCode is ignored. */ + @Override public boolean sendKeyEvent(int scanCode, int keyCode, boolean keyDown) { if (!mConnected) { return false; @@ -204,6 +207,7 @@ public boolean sendKeyEvent(int scanCode, int keyCode, boolean keyDown) { } /** Sends TextEvent to the host. */ + @Override public void sendTextEvent(String text) { if (!mConnected) { return; @@ -213,6 +217,7 @@ public void sendTextEvent(String text) { } /** Sends an array of TouchEvents to the host. */ + @Override public void sendTouchEvent(TouchEventData.EventType eventType, TouchEventData[] data) { if (!mConnected) { return; diff --git a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java b/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java index 0987a09a330003..501ce29fdf8511 100644 --- a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java +++ b/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java @@ -122,6 +122,7 @@ private static class TestNfcDelegate implements NfcDelegate { public TestNfcDelegate(Activity activity) { mActivity = activity; } + @Override public void trackActivityForHost(int hostId, Callback callback) { mCallback = callback; } @@ -130,6 +131,7 @@ public void invokeCallback() { mCallback.onResult(mActivity); } + @Override public void stopTrackingActivityForHost(int hostId) {} } diff --git a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java index a9a9ac2cb8c8b6..d4c72540aea98a 100644 --- a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java +++ b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java @@ -31,6 +31,7 @@ private static BarcodeDetectionResult[] detect(org.chromium.skia.mojom.Bitmap mo final ArrayBlockingQueue queue = new ArrayBlockingQueue<>(1); detector.detect(mojoBitmap, new BarcodeDetection.DetectResponse() { + @Override public void call(BarcodeDetectionResult[] results) { queue.add(results); } diff --git a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java index 96f619105a8c53..daa2e7e7ca410a 100644 --- a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java +++ b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java @@ -58,6 +58,7 @@ private static FaceDetectionResult[] detect(org.chromium.skia.mojom.Bitmap mojoB final ArrayBlockingQueue queue = new ArrayBlockingQueue<>(1); detector.detect(mojoBitmap, new FaceDetection.DetectResponse() { + @Override public void call(FaceDetectionResult[] results) { queue.add(results); } diff --git a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java index f7ca0084ea56e6..91b867cb5327fb 100644 --- a/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java +++ b/services/shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java @@ -36,6 +36,7 @@ private static TextDetectionResult[] detect(org.chromium.skia.mojom.Bitmap mojoB final ArrayBlockingQueue queue = new ArrayBlockingQueue<>(1); detector.detect(mojoBitmap, new TextDetection.DetectResponse() { + @Override public void call(TextDetectionResult[] results) { queue.add(results); } diff --git a/testing/android/appurify_support/java/src/org/chromium/test/support/RobotiumBundleGenerator.java b/testing/android/appurify_support/java/src/org/chromium/test/support/RobotiumBundleGenerator.java index 681e7c61b81a06..cf54ff9631caf2 100644 --- a/testing/android/appurify_support/java/src/org/chromium/test/support/RobotiumBundleGenerator.java +++ b/testing/android/appurify_support/java/src/org/chromium/test/support/RobotiumBundleGenerator.java @@ -19,6 +19,7 @@ public class RobotiumBundleGenerator implements ResultsBundleGenerator { private static final String TAG = "RobotiumBundleGenerator"; + @Override public List generateIntermediateTestResults( Map rawResults) { if (rawResults.isEmpty()) { @@ -77,6 +78,7 @@ public List generateIntermediateTestResul return testCaseResultList; } + @Override public Bundle generate(int testsPassed, int testsFailed, int testsErrored, int totalTests) { Bundle resultsBundle = new Bundle(); StringBuilder resultBuilder = new StringBuilder(); diff --git a/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java b/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java index 1fd3d8ce534ec2..eb957dcbeacbca 100644 --- a/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java +++ b/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java @@ -31,6 +31,7 @@ public class BackgroundShadowAsyncTask extends private static final ExecutorService sExecutorService = Executors.newSingleThreadExecutor(); + @Override @Implementation @SafeVarargs public final AsyncTask execute(final Params... params) { @@ -47,6 +48,7 @@ public AsyncTask call() throws Exception { } } + @Override @Implementation public final Result get() { try { diff --git a/testing/android/junit/java/src/org/chromium/testing/local/CustomShadowAsyncTask.java b/testing/android/junit/java/src/org/chromium/testing/local/CustomShadowAsyncTask.java index 6c81130a5b8b5a..35168f3f9df114 100644 --- a/testing/android/junit/java/src/org/chromium/testing/local/CustomShadowAsyncTask.java +++ b/testing/android/junit/java/src/org/chromium/testing/local/CustomShadowAsyncTask.java @@ -19,6 +19,7 @@ @Implements(AsyncTask.class) public class CustomShadowAsyncTask extends ShadowAsyncTask { + @Override @Implementation public AsyncTask executeOnExecutor( Executor executor, Params... params) { diff --git a/testing/android/junit/java/src/org/chromium/testing/local/GtestComputer.java b/testing/android/junit/java/src/org/chromium/testing/local/GtestComputer.java index c6782d0d273e4d..e304631458aa09 100644 --- a/testing/android/junit/java/src/org/chromium/testing/local/GtestComputer.java +++ b/testing/android/junit/java/src/org/chromium/testing/local/GtestComputer.java @@ -35,10 +35,12 @@ public GtestSuiteRunner(Runner contained) { mRunner = contained; } + @Override public Description getDescription() { return mRunner.getDescription(); } + @Override public void run(RunNotifier notifier) { long startTimeMillis = System.currentTimeMillis(); mLogger.testCaseStarted(mRunner.getDescription(), @@ -49,6 +51,7 @@ public void run(RunNotifier notifier) { System.currentTimeMillis() - startTimeMillis); } + @Override public void filter(Filter filter) throws NoTestsRemainException { if (mRunner instanceof Filterable) { ((Filterable) mRunner).filter(filter); diff --git a/testing/android/reporter/java/src/org/chromium/test/reporter/TestStatusListener.java b/testing/android/reporter/java/src/org/chromium/test/reporter/TestStatusListener.java index 13a8af82458e43..a807af30a70957 100644 --- a/testing/android/reporter/java/src/org/chromium/test/reporter/TestStatusListener.java +++ b/testing/android/reporter/java/src/org/chromium/test/reporter/TestStatusListener.java @@ -47,6 +47,7 @@ public void addError(Test test, Throwable t) { @param test The test in which the failure occurred. @param t The exception that was raised. */ + @Override public void addFailure(Test test, AssertionFailedError e) { Log.e(TAG, "Failure while running " + test.toString(), e); mFailed = true;