[cr137] [Android] Remove patch for ExportFlow

Upstream now calls `runCreateFileOnDiskIntent` either way, so this patch becomes obsolete.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/a58bf5281372f484db298f8fcd1c0a8dda0f64a0

[CodeHealth] Clean up LocalPasswordsAndroidAccessLossWarning. Part 1

I've split the cleanup into multiple parts to facilitate the review.

This CL cleans up the code related to password export. It:
1) Enables the feature flag by default in the export flow code.
2) Deletes up ExportWarningDialogFragment that is not used anymore,
and cleans up its tests and strings used only there
3) Deletes PasswordSettingsExportTests, because they test password
export from settings only, and M4.1 export is handled in
PasswordAccessLossExportDialogCoordinatorTest

In the second part I will enable feature by default in other parts of
code.

Change-Id: I233affd3cb8b47cc067a055e92aca219cd5776ef
This commit is contained in:
Artem Samoilenko
2025-05-13 15:53:10 -04:00
committed by Max Karolinskiy
parent bf3b4bed0a
commit 39751f34d6
7 changed files with 0 additions and 68 deletions
-1
View File
@@ -293,7 +293,6 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2Fragment.java",
"../../brave/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2PagerAdapter.java",
"../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
"../../brave/android/java/org/chromium/chrome/browser/password_manager/settings/BraveExportFlow.java",
"../../brave/android/java/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsBase.java",
"../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistHostActivity.java",
"../../brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java",
-10
View File
@@ -846,16 +846,6 @@
-keep class org.chromium.chrome.browser.omnibox.suggestions.editurl.BraveEditUrlSuggestionProcessorBase
-keep class org.chromium.chrome.browser.password_manager.settings.ExportFlow {
public <init>(...);
*** runSharePasswordsIntent(...);
*** runCreateFileOnDiskIntent(...);
}
-keep class org.chromium.chrome.browser.password_manager.settings.BraveExportFlow {
public <init>(...);
}
-keep class org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesLayout
-keep class org.chromium.chrome.browser.suggestions.tile.BraveMostVisitedTilesLayoutBase
@@ -1,19 +0,0 @@
/* Copyright (c) 2024 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.password_manager.settings;
import org.chromium.base.BraveReflectionUtil;
import org.chromium.chrome.browser.access_loss.PasswordAccessLossWarningType;
public class BraveExportFlow extends ExportFlow {
public BraveExportFlow(@PasswordAccessLossWarningType int warningType) {
super(warningType);
}
public void runSharePasswordsIntent() {
BraveReflectionUtil.invokeMethod(ExportFlow.class, this, "runCreateFileOnDiskIntent");
}
}
@@ -817,12 +817,6 @@ public class BytecodeTest {
MethodModifier.STATIC,
String.class,
int.class));
Assert.assertTrue(
methodExists(
"org/chromium/chrome/browser/password_manager/settings/ExportFlow",
"runSharePasswordsIntent",
MethodModifier.REGULAR,
void.class));
Assert.assertTrue(
methodExists(
"org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider",
@@ -1790,11 +1784,6 @@ public class BytecodeTest {
Optional.class,
Supplier.class,
Supplier.class));
Assert.assertTrue(
constructorsMatch(
"org/chromium/chrome/browser/password_manager/settings/ExportFlow",
"org/chromium/chrome/browser/password_manager/settings/BraveExportFlow",
int.class));
Assert.assertTrue(
constructorsMatch(
-1
View File
@@ -48,7 +48,6 @@ java_binary("java_bytecode_rewriter") {
"//brave/build/android/bytecode/java/org/brave/bytecode/BraveDynamicColorsClassAdapter.java",
"//brave/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorBaseClassAdapter.java",
"//brave/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java",
"//brave/build/android/bytecode/java/org/brave/bytecode/BraveExportFlowClassAdapter.java",
"//brave/build/android/bytecode/java/org/brave/bytecode/BraveExternalNavigationHandlerClassAdapter.java",
"//brave/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java",
"//brave/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceMediatorClassAdapter.java",
@@ -48,7 +48,6 @@ public class BraveClassAdapter {
chain = new BraveDynamicColorsClassAdapter(chain);
chain = new BraveEditUrlSuggestionProcessorBaseClassAdapter(chain);
chain = new BraveEditUrlSuggestionProcessorClassAdapter(chain);
chain = new BraveExportFlowClassAdapter(chain);
chain = new BraveExternalNavigationHandlerClassAdapter(chain);
chain = new BraveFeedSurfaceCoordinatorClassAdapter(chain);
chain = new BraveFeedSurfaceMediatorClassAdapter(chain);
@@ -1,25 +0,0 @@
/* Copyright (c) 2024 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.brave.bytecode;
import org.objectweb.asm.ClassVisitor;
public class BraveExportFlowClassAdapter extends BraveClassVisitor {
static String sExportFlowClassName =
"org/chromium/chrome/browser/password_manager/settings/ExportFlow";
static String sBraveExportFlowClassName =
"org/chromium/chrome/browser/password_manager/settings/BraveExportFlow";
public BraveExportFlowClassAdapter(ClassVisitor visitor) {
super(visitor);
redirectConstructor(sExportFlowClassName, sBraveExportFlowClassName);
makePublicMethod(sExportFlowClassName, "runSharePasswordsIntent");
addMethodAnnotation(
sBraveExportFlowClassName, "runSharePasswordsIntent", "Ljava/lang/Override;");
}
}