Backed out changeset 22970015ff0c (bug 1815739) for saveAContentPdfDo…

…cument related junit failures. CLOSED TREE
dothq · Nov 13, 2023 · c3f330e · c3f330e
1 parent e719890
commit c3f330e
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 648 deletions.
diff --git a/mobile/android/components/geckoview/GeckoViewContentChannel.cpp b/mobile/android/components/geckoview/GeckoViewContentChannel.cpp
diff --git a/mobile/android/components/geckoview/GeckoViewContentChannel.h b/mobile/android/components/geckoview/GeckoViewContentChannel.h
diff --git a/mobile/android/components/geckoview/GeckoViewContentProtocolHandler.cpp b/mobile/android/components/geckoview/GeckoViewContentProtocolHandler.cpp
diff --git a/mobile/android/components/geckoview/GeckoViewContentProtocolHandler.h b/mobile/android/components/geckoview/GeckoViewContentProtocolHandler.h
diff --git a/mobile/android/components/geckoview/GeckoViewInputStream.cpp b/mobile/android/components/geckoview/GeckoViewInputStream.cpp
diff --git a/mobile/android/components/geckoview/GeckoViewInputStream.h b/mobile/android/components/geckoview/GeckoViewInputStream.h
diff --git a/mobile/android/components/geckoview/components.conf b/mobile/android/components/geckoview/components.conf
@@ -77,20 +77,6 @@ Classes = [
         'headers': ['GeckoViewExternalAppService.h'],
         'processes': ProcessSelector.ALLOW_IN_SOCKET_PROCESS,
     },
-    {
-        'cid': '{a8f4582e-4b47-4e06-970d-b94b76977bf7}',
-        'contract_ids': ['@mozilla.org/network/protocol;1?name=content'],
-        'type': 'GeckoViewContentProtocolHandler',
-        'headers': ['./GeckoViewContentProtocolHandler.h'],
-        'protocol_config': {
-            'scheme': 'content',
-            'flags': [
-                'URI_IS_POTENTIALLY_TRUSTWORTHY',
-                'URI_IS_LOCAL_RESOURCE',
-                'URI_DANGEROUS_TO_LOAD',
-            ],
-        },
-    },
 ]
 
 if defined('MOZ_ANDROID_HISTORY'):

diff --git a/mobile/android/components/geckoview/moz.build b/mobile/android/components/geckoview/moz.build
@@ -5,19 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
-    "GeckoViewContentChannel.cpp",
-    "GeckoViewContentProtocolHandler.cpp",
     "GeckoViewExternalAppService.cpp",
-    "GeckoViewInputStream.cpp",
     "GeckoViewOutputStream.cpp",
     "GeckoViewStreamListener.cpp",
 ]
 
 EXPORTS += [
-    "GeckoViewContentChannel.h",
-    "GeckoViewContentProtocolHandler.h",
     "GeckoViewExternalAppService.h",
-    "GeckoViewInputStream.h",
     "GeckoViewOutputStream.h",
     "GeckoViewStreamListener.h",
 ]

diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PdfCreationTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PdfCreationTest.kt
@@ -158,20 +158,4 @@ class PdfCreationTest : BaseSessionTest() {
             }
         }
     }
-
-    @NullDelegate(Autofill.Delegate::class)
-    @Test
-    fun saveAContentPdfDocument() {
-        activityRule.scenario.onActivity {
-            val originalBytes = getTestBytes(HELLO_PDF_WORLD_PDF_PATH)
-            TestContentProvider.setTestData(originalBytes, "application/pdf")
-            mainSession.loadUri("content://org.mozilla.geckoview.test.provider/pdf")
-            mainSession.waitForPageStop()
-
-            val response = mainSession.pdfFileSaver.save()
-            sessionRule.waitForResult(response).let {
-                assertThat("The PDF File must the same as the original one.", it.body?.readBytes(), equalTo(originalBytes))
-            }
-        }
-    }
 }