diff options
Diffstat (limited to 'chromium/content/public/android')
8 files changed, 27 insertions, 20 deletions
diff --git a/chromium/content/public/android/BUILD.gn b/chromium/content/public/android/BUILD.gn index fedef329f1c..acc6c3cb82d 100644 --- a/chromium/content/public/android/BUILD.gn +++ b/chromium/content/public/android/BUILD.gn @@ -56,16 +56,13 @@ android_resources("content_java_resources") { ] } -action("generate_sandboxed_service_srcjar") { +action_with_pydeps("generate_sandboxed_service_srcjar") { script = "//content/public/android/generate_child_service.py" - depfile = "$target_gen_dir/$target_name.d" _srcjar_path = "${target_gen_dir}/${target_name}.srcjar" _rebased_srcjar_path = rebase_path(_srcjar_path, root_build_dir) args = [ - "--depfile", - rebase_path(depfile, root_build_dir), "40", _rebased_srcjar_path, ] @@ -282,6 +279,7 @@ android_library("content_java") { "java/src/org/chromium/content_public/browser/DeviceUtils.java", "java/src/org/chromium/content_public/browser/GestureListenerManager.java", "java/src/org/chromium/content_public/browser/GestureStateListener.java", + "java/src/org/chromium/content_public/browser/GestureStateListenerWithScroll.java", "java/src/org/chromium/content_public/browser/ImageDownloadCallback.java", "java/src/org/chromium/content_public/browser/ImeAdapter.java", "java/src/org/chromium/content_public/browser/ImeEventObserver.java", @@ -347,7 +345,6 @@ java_cpp_enum("content_public_android_java_enums_srcjar") { "//content/public/browser/invalidate_type.h", "//content/public/browser/navigation_controller.h", "//content/public/browser/visibility.h", - "//content/public/browser/xr_consent_prompt_level.h", "//content/public/common/browser_controls_state.h", "//content/public/common/console_message_level.h", "//content/public/common/screen_orientation_values.h", @@ -486,6 +483,7 @@ android_library("content_javatests") { "javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java", "javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java", "javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java", + "javatests/src/org/chromium/content/browser/GestureListenerManagerTest.java", "javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java", "javatests/src/org/chromium/content/browser/JavaBridgeActivityTestRule.java", "javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java", @@ -571,7 +569,10 @@ junit_binary("content_junit_tests") { "//content/public/test/android:content_java_test_support", "//media/mojo/mojom:mojom_java", "//mojo/public/java:bindings_java", + "//mojo/public/mojom/base:base_java", + "//third_party/android_deps:androidx_test_core_java", "//third_party/blink/public/mojom:android_mojo_bindings_java", + "//third_party/hamcrest:hamcrest_java", "//ui/android:ui_java", "//ui/gfx/geometry/mojom:mojom_java", ] diff --git a/chromium/content/public/android/generate_child_service.py b/chromium/content/public/android/generate_child_service.py index ebe07f2d8f1..8c28dd6242c 100755 --- a/chromium/content/public/android/generate_child_service.py +++ b/chromium/content/public/android/generate_child_service.py @@ -35,7 +35,6 @@ public class SandboxedProcessService{0} extends SandboxedProcessService {{ def DoMain(argv): usage = 'usage: %prog [number] [output]' parser = optparse.OptionParser(usage=usage) - build_utils.AddDepfileOption(parser) options, args = parser.parse_args(argv) @@ -52,8 +51,5 @@ def DoMain(argv): path_template.format(i), data=GenerateService(i)) - if options.depfile: - build_utils.WriteDepfile(options.depfile, output) - if __name__ == '__main__': DoMain(sys.argv[1:]) diff --git a/chromium/content/public/android/generate_child_service.pydeps b/chromium/content/public/android/generate_child_service.pydeps new file mode 100644 index 00000000000..0d6c910a650 --- /dev/null +++ b/chromium/content/public/android/generate_child_service.pydeps @@ -0,0 +1,6 @@ +# Generated by running: +# build/print_python_deps.py --root content/public/android --output content/public/android/generate_child_service.pydeps content/public/android/generate_child_service.py +../../../build/android/gyp/util/__init__.py +../../../build/android/gyp/util/build_utils.py +../../../build/gn_helpers.py +generate_child_service.py diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java index 1f2062983dd..40522b0b744 100644 --- a/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java +++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java @@ -23,8 +23,8 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLooper; import org.chromium.base.process_launcher.ChildProcessConnection; +import org.chromium.base.process_launcher.TestChildProcessConnection; import org.chromium.base.test.BaseRobolectricTestRunner; -import org.chromium.base.test.TestChildProcessConnection; import org.chromium.base.test.util.Feature; import java.util.ArrayList; diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java index 5175b7032f4..823891d0f66 100644 --- a/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java +++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java @@ -13,8 +13,8 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLooper; import org.chromium.base.process_launcher.ChildProcessConnection; +import org.chromium.base.process_launcher.TestChildProcessConnection; import org.chromium.base.test.BaseRobolectricTestRunner; -import org.chromium.base.test.TestChildProcessConnection; import org.chromium.content_public.browser.ChildProcessImportance; /** Unit tests for ChildProessRanking */ diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java index fa65ca16c01..f4fea4d63fe 100644 --- a/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java +++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue; import static org.chromium.base.task.TaskTraits.THREAD_POOL; import static org.chromium.content_public.browser.test.util.CriteriaHelper.DEFAULT_POLLING_INTERVAL; -import android.support.test.filters.MediumTest; +import androidx.test.filters.MediumTest; import org.junit.Assert; import org.junit.Rule; @@ -25,6 +25,7 @@ import org.chromium.base.task.PostTask; import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.content_public.browser.test.util.Criteria; import org.chromium.content_public.browser.test.util.CriteriaHelper; +import org.chromium.content_public.browser.test.util.CriteriaNotSatisfiedException; import java.io.PrintWriter; import java.io.StringWriter; @@ -245,7 +246,7 @@ public class CriteriaHelperTest { }, 0, DEFAULT_POLLING_INTERVAL); } - private String getStackTrace(AssertionError e) { + private String getStackTrace(Throwable e) { StringWriter sw = new StringWriter(); e.printStackTrace(new PrintWriter(sw)); return sw.toString(); @@ -255,7 +256,9 @@ public class CriteriaHelperTest { @MediumTest public void testStack_Runnable_UiThread() { try { - CriteriaHelper.pollUiThread((Runnable) Assert::fail, 0, DEFAULT_POLLING_INTERVAL); + CriteriaHelper.pollUiThread(() -> { + throw new CriteriaNotSatisfiedException("test"); + }, 0, DEFAULT_POLLING_INTERVAL); } catch (AssertionError e) { assertThat(getStackTrace(e), containsString("CriteriaHelperTest.testStack_Runnable_UiThread(")); @@ -268,8 +271,9 @@ public class CriteriaHelperTest { @MediumTest public void testStack_Runnable_InstrumentationThread() { try { - CriteriaHelper.pollInstrumentationThread( - (Runnable) Assert::fail, 0, DEFAULT_POLLING_INTERVAL); + CriteriaHelper.pollInstrumentationThread(() -> { + throw new CriteriaNotSatisfiedException("test"); + }, 0, DEFAULT_POLLING_INTERVAL); } catch (AssertionError e) { assertThat(getStackTrace(e), containsString("CriteriaHelperTest.testStack_Runnable_InstrumentationThread(")); diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java index f2ba7649bc2..79a99c84750 100644 --- a/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java +++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java @@ -27,8 +27,8 @@ import org.robolectric.shadows.ShadowLooper; import org.chromium.base.process_launcher.ChildConnectionAllocator; import org.chromium.base.process_launcher.ChildProcessConnection; +import org.chromium.base.process_launcher.TestChildProcessConnection; import org.chromium.base.test.BaseRobolectricTestRunner; -import org.chromium.base.test.TestChildProcessConnection; import org.chromium.base.test.util.Feature; /** Unit tests for the SpareChildConnection class. */ @@ -53,8 +53,8 @@ public class SpareChildConnectionTest { @Override public ChildProcessConnection createConnection(Context context, ComponentName serviceName, - boolean bindToCaller, boolean bindAsExternalService, Bundle serviceBundle, - String instanceName) { + ComponentName fallbackServiceName, boolean bindToCaller, + boolean bindAsExternalService, Bundle serviceBundle, String instanceName) { // We expect to create only one connection in these tests. assert mConnection == null; mConnection = new TestChildProcessConnection( diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java index 17090971211..8e2140d5f0b 100644 --- a/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java +++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java @@ -7,7 +7,7 @@ package org.chromium.content.browser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; |