[Android] Various classes and variables were renamed, extended or moved

android/java/org/chromium/chrome/browser/BraveUphold.java

@@ -50,7 +50,7 @@ public class BraveUphold implements BraveRewardsObserver {
         mBraveExternalNavigationHandler = handler;
         rewardsNativeProxy = BraveRewardsNativeWorker.getInstance();
 
-        Uri uri = Uri.parse(params.getUrl());
+        Uri uri = Uri.parse(params.getUrl().getSpec());
         rewardsNativeProxy.AddObserver(this);
         String path = uri.getPath();
         String query = uri.getQuery();

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -88,7 +88,7 @@ import org.chromium.chrome.browser.rate.RateUtils;
 import org.chromium.chrome.browser.settings.BraveRewardsPreferences;
 import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
 import org.chromium.chrome.browser.share.ShareDelegate;
-import org.chromium.chrome.browser.share.ShareDelegateImpl.ShareOrigin;
+import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tab.TabLaunchType;

android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java

@@ -5,11 +5,12 @@
 
 package org.chromium.chrome.browser.externalnav;
 
+import org.chromium.chrome.browser.BraveUphold;
 import org.chromium.components.external_intents.ExternalNavigationDelegate;
 import org.chromium.components.external_intents.ExternalNavigationHandler;
-import org.chromium.components.external_intents.ExternalNavigationParams;
 import org.chromium.components.external_intents.ExternalNavigationHandler.OverrideUrlLoadingResult;
-import org.chromium.chrome.browser.BraveUphold;
+import org.chromium.components.external_intents.ExternalNavigationParams;
+import org.chromium.url.GURL;
 
 public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
     private BraveUphold mBraveUphold;
@@ -28,7 +29,7 @@ public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
     }
 
     private boolean isUpholdOverride(ExternalNavigationParams params) {
-        if (!params.getUrl().startsWith(BraveUphold.UPHOLD_REDIRECT_URL)) return false;
+        if (!params.getUrl().getSpec().startsWith(BraveUphold.UPHOLD_REDIRECT_URL)) return false;
         return true;
     }
 
@@ -49,6 +50,7 @@ public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
         if (params.getRedirectHandler() != null) {
             params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
         }
-        return clobberCurrentTab(browserFallbackUrl, params.getReferrerUrl());
+        GURL browserFallbackGURL = new GURL(browserFallbackUrl);
+        return clobberCurrentTab(browserFallbackGURL, params.getReferrerUrl());
     }
 }

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java

@@ -51,9 +51,10 @@ public class BraveNewTabPage extends NewTabPage {
     protected void initializeMainView(Activity activity, WindowAndroid windowAndroid,
             SnackbarManager snackbarManager, NewTabPageUma uma, boolean isInNightMode,
             BottomSheetController bottomSheetController,
-            ObservableSupplier<ShareDelegate> shareDelegateSupplier) {
+            ObservableSupplier<ShareDelegate> shareDelegateSupplier,
+            TabModelSelector tabModelSelector) {
         super.initializeMainView(activity, windowAndroid, snackbarManager, uma, isInNightMode,
-                bottomSheetController, shareDelegateSupplier);
+                bottomSheetController, shareDelegateSupplier, tabModelSelector);
         // Override surface provider
         Profile profile = Profile.fromWebContents(mTab.getWebContents());
 
@@ -63,6 +64,7 @@ public class BraveNewTabPage extends NewTabPage {
                 mNewTabPageLayout, null, isInNightMode, this,
                 mNewTabPageManager.getNavigationDelegate(), profile,
                 /* isPlaceholderShownInitially= */ false, bottomSheetController,
-                shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null);
+                shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null,
+                tabModelSelector);
     }
 }

android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java

@@ -14,9 +14,9 @@ import org.chromium.base.Callback;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.signin.services.SigninManager;
-import org.chromium.components.signin.AccountTrackerService;
 import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.signin.identitymanager.AccountInfoService;
+import org.chromium.components.signin.identitymanager.AccountTrackerService;
 import org.chromium.components.signin.identitymanager.IdentityManager;
 import org.chromium.components.signin.identitymanager.IdentityMutator;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
@@ -106,7 +106,7 @@ public class BraveSigninManager implements SigninManager {
     static SigninManager create(long nativeSigninManagerAndroid,
             AccountTrackerService accountTrackerService, IdentityManager identityManager,
             IdentityMutator identityMutator) {
-        AccountInfoService.init(identityManager);
+        AccountInfoService.init(identityManager, accountTrackerService);
         return new BraveSigninManager(identityManager);
     }