diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/minidump_uploader | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/minidump_uploader')
5 files changed, 7 insertions, 5 deletions
diff --git a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java index d7d0f71c128..83b6c80b294 100644 --- a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java +++ b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java @@ -7,8 +7,9 @@ package org.chromium.components.minidump_uploader; import static org.junit.Assert.assertArrayEquals; import android.os.ParcelFileDescriptor; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import org.junit.Assert; import org.junit.Before; diff --git a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java index a2997cef3a6..333a93e3447 100644 --- a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java +++ b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadCallableTest.java @@ -4,7 +4,7 @@ package org.chromium.components.minidump_uploader; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Assert; import org.junit.Before; diff --git a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadJobImplTest.java b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadJobImplTest.java index edf4e81a91b..3104fe50f1c 100644 --- a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadJobImplTest.java +++ b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploadJobImplTest.java @@ -4,7 +4,7 @@ package org.chromium.components.minidump_uploader; -import android.support.test.filters.MediumTest; +import androidx.test.filters.MediumTest; import org.junit.Assert; import org.junit.Rule; diff --git a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderTest.java b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderTest.java index 1e4fe707b2f..3a67edec7ed 100644 --- a/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderTest.java +++ b/chromium/components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/MinidumpUploaderTest.java @@ -4,7 +4,7 @@ package org.chromium.components.minidump_uploader; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.Assert; diff --git a/chromium/components/minidump_uploader/rewrite_minidumps_as_mimes.cc b/chromium/components/minidump_uploader/rewrite_minidumps_as_mimes.cc index ba57a468659..e5c9bbdbffa 100644 --- a/chromium/components/minidump_uploader/rewrite_minidumps_as_mimes.cc +++ b/chromium/components/minidump_uploader/rewrite_minidumps_as_mimes.cc @@ -9,6 +9,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/metrics/histogram_macros.h" +#include "base/notreached.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "components/minidump_uploader/minidump_uploader_jni_headers/CrashReportMimeWriter_jni.h" |