File-to-Uri should be called in a background thread.

Bug: 1056176
Change-Id: I3e3b4cdca19c628c1e575fae2e90fe0f016e488b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2078982
Commit-Queue: Gayane Petrosyan <gayane@chromium.org>
Auto-Submit: Gayane Petrosyan <gayane@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748805}

chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java

@@ -148,7 +148,6 @@ public class ContextMenuTest implements CustomMainActivityStart {
 
     @Test
     @MediumTest
-    @DisabledTest(message = "https://crbug.com/1056176")
     @Feature({"Browser"})
     @EnableFeatures({ChromeFeatureList.CONTEXT_MENU_SEARCH_WITH_GOOGLE_LENS})
     public void testSearchWithGoogleLensFiresIntent() throws Throwable {
@@ -166,7 +165,6 @@ public class ContextMenuTest implements CustomMainActivityStart {
 
     @Test
     @MediumTest
-    @DisabledTest(message = "https://crbug.com/1056176")
     @Feature({"Browser"})
     @CommandLineFlags.Add({"enable-features="
                     + ChromeFeatureList.CONTEXT_MENU_SEARCH_WITH_GOOGLE_LENS + "<FakeStudyName",

chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ShareImageFileUtils.java

@@ -123,7 +123,17 @@ public class ShareImageFileUtils {
         OnImageSaveListener listener = new OnImageSaveListener() {
             @Override
             public void onImageSaved(File imageFile) {
-                callback.onResult(ContentUriUtils.getContentUriFromFile(imageFile));
+                new AsyncTask<Uri>() {
+                    @Override
+                    protected Uri doInBackground() {
+                        return ContentUriUtils.getContentUriFromFile(imageFile);
+                    }
+
+                    @Override
+                    protected void onPostExecute(Uri uri) {
+                        callback.onResult(uri);
+                    }
+                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
             @Override
             public void onImageSaveError() {}

chrome/browser/share/android/javatests/src/org/chromium/chrome/browser/share/ShareImageFileUtilsTest.java

@@ -29,7 +29,6 @@ import org.chromium.base.task.AsyncTask;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisableIf;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.ChromeActivityTestRule;
@@ -176,7 +175,6 @@ public class ShareImageFileUtilsTest {
 
     @Test
     @SmallTest
-    @DisabledTest(message = "https://crbug.com/1056176")
     public void clipboardUriDoNotClearTest() throws TimeoutException, IOException {
         generateAnImageToClipboard();
         generateAnImageToClipboard();
@@ -190,7 +188,6 @@ public class ShareImageFileUtilsTest {
 
     @Test
     @SmallTest
-    @DisabledTest(message = "https://crbug.com/1056176")
     public void clearEverythingIfNoClipboardImageTest() throws TimeoutException, IOException {
         generateAnImageToClipboard();
         generateAnImageToClipboard();