Commit 97dbb8fa authored by Eric Stevenson's avatar Eric Stevenson Committed by Commit Bot

JNI refactor: @NativeMethods conversion (AutocompleteController).

This CL was partially created by
//base/android/jni_generator/jni_refactorer.py.

The conversion also required converting unit tests to use the new JNI
mocking approach provided by JniMocker.

Bug: 929661
Change-Id: I57cc3e19641af73e745ea1b224947586ba2287bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1834035
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707384}
parent f402914b
...@@ -32,7 +32,7 @@ public class AutocompleteCoordinatorFactory { ...@@ -32,7 +32,7 @@ public class AutocompleteCoordinatorFactory {
/** /**
* Temporary shortcut for {@link org.chromium.chrome.browser.IntentHandler} to access * Temporary shortcut for {@link org.chromium.chrome.browser.IntentHandler} to access
* {@link AutocompleteController#nativeQualifyPartialURLQuery(String)} without having an * {@link AutocompleteControllerJni.get().qualifyPartialURLQuery(String)} without having an
* instance of {@link AutocompleteCoordinator}. * instance of {@link AutocompleteCoordinator}.
* *
* TODO(crbug.com/966424): Fix the dependency issue and remove this method. * TODO(crbug.com/966424): Fix the dependency issue and remove this method.
...@@ -42,6 +42,6 @@ public class AutocompleteCoordinatorFactory { ...@@ -42,6 +42,6 @@ public class AutocompleteCoordinatorFactory {
*/ */
@Deprecated @Deprecated
public static String qualifyPartialURLQuery(String query) { public static String qualifyPartialURLQuery(String query) {
return AutocompleteController.nativeQualifyPartialURLQuery(query); return AutocompleteControllerJni.get().qualifyPartialURLQuery(query);
} }
} }
...@@ -265,12 +265,12 @@ public class AutocompleteCoordinatorImpl implements AutocompleteCoordinator { ...@@ -265,12 +265,12 @@ public class AutocompleteCoordinatorImpl implements AutocompleteCoordinator {
@Override @Override
public String qualifyPartialURLQuery(String query) { public String qualifyPartialURLQuery(String query) {
return AutocompleteController.nativeQualifyPartialURLQuery(query); return AutocompleteControllerJni.get().qualifyPartialURLQuery(query);
} }
@Override @Override
public void prefetchZeroSuggestResults() { public void prefetchZeroSuggestResults() {
AutocompleteController.nativePrefetchZeroSuggestResults(); AutocompleteControllerJni.get().prefetchZeroSuggestResults();
} }
@VisibleForTesting @VisibleForTesting
......
...@@ -381,7 +381,7 @@ class AutocompleteMediator ...@@ -381,7 +381,7 @@ class AutocompleteMediator
private void maybeTriggerCacheRefresh(String url) { private void maybeTriggerCacheRefresh(String url) {
if (url == null) return; if (url == null) return;
if (!UrlConstants.NTP_URL.equals(url)) return; if (!UrlConstants.NTP_URL.equals(url)) return;
AutocompleteController.nativePrefetchZeroSuggestResults(); AutocompleteControllerJni.get().prefetchZeroSuggestResults();
} }
}; };
} }
......
...@@ -185,11 +185,6 @@ public class OmniboxTestUtils { ...@@ -185,11 +185,6 @@ public class OmniboxTestUtils {
mSuggestionsDispatcher = null; mSuggestionsDispatcher = null;
} }
@Override
protected long nativeInit(Profile profile) {
return 1;
}
@Override @Override
public void setProfile(Profile profile) {} public void setProfile(Profile profile) {}
} }
...@@ -219,11 +214,6 @@ public class OmniboxTestUtils { ...@@ -219,11 +214,6 @@ public class OmniboxTestUtils {
@Override @Override
public void stop(boolean clear) {} public void stop(boolean clear) {}
@Override
protected long nativeInit(Profile profile) {
return 1;
}
@Override @Override
public void setProfile(Profile profile) {} public void setProfile(Profile profile) {}
} }
......
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