From c94980e7d6979e83fb516ec3b0651c12a45fd3c4 Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Fri, 4 Oct 2019 22:13:41 -0400
Subject: [PATCH] Android: SigninManager c'tor/create signature changes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/11320f06e117d93f40f0443cd67c55ad65c5943f

commit 11320f06e117d93f40f0443cd67c55ad65c5943f
Author: Pâris MEULEMAN <pmeuleman@chromium.org>
Date:   Fri Jul 26 17:11:09 2019 +0000

    Merge SigninManagerDelegate back into SigninManager

    This merges back SigninManagerDelegate.java into SigninManager.java and
    likewise for c++ code. This is in the scope of a change of strategy
    regarding the identityManager implementation on Android, using a
    layering strategy similar to what was done on iOS.

    The change consist in:
    * copy chrome_signin_manager_delegate.* methods to
      signin_manager_android.*
    * rename occurrences of ChromeSigninManagerDelegate to
      SigninManagerAndroid, in Java including JNI invocations and C++.
    * Directly invoke methods instead of calling mDelegate (java)
    * Update constructors to include the delegate dependencies.

    * A significant change that is not an obvious code move is the rollback of
      SigninManagerAndroid's constructor using
      SigninClient/PrefService(local_state) to Profile. This makes the
      remainder of the change much simpler, but does cascade to the factory.

    The above changes are described in their files in PS3:
    crrev.com/c/1700210/3
---
 .../chrome/browser/signin/BraveSigninManager.java | 15 ++++++++-------
 .../android/signin/signin_manager_android.cc      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java
index 3e291819b94..f02778cfc4e 100644
--- a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java
+++ b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java
@@ -10,11 +10,13 @@ import android.content.Context;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.components.signin.AccountTrackerService;
+import org.chromium.components.sync.AndroidSyncSettings;
 
 public class BraveSigninManager extends SigninManager {
-    BraveSigninManager(Context context, long nativeSigninManagerAndroid, SigninManagerDelegate delegate,
+    BraveSigninManager(Context context, long nativeSigninManagerAndroid,
             AccountTrackerService accountTrackerService) {
-        super(context, nativeSigninManagerAndroid, delegate, accountTrackerService);
+        super(context, nativeSigninManagerAndroid, accountTrackerService,
+                AndroidSyncSettings.get());
     }
 
     @Override
@@ -28,12 +30,11 @@ public class BraveSigninManager extends SigninManager {
     }
 
     @CalledByNative
-    private static SigninManager create(long nativeSigninManagerAndroid,
-            SigninManagerDelegate delegate, AccountTrackerService accountTrackerService) {
+    private static SigninManager create(
+            long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService) {
         assert nativeSigninManagerAndroid != 0;
-        assert delegate != null;
         assert accountTrackerService != null;
-        return new BraveSigninManager(ContextUtils.getApplicationContext(), nativeSigninManagerAndroid,
-                delegate, accountTrackerService);
+        return new BraveSigninManager(ContextUtils.getApplicationContext(),
+                nativeSigninManagerAndroid, accountTrackerService);
     }
 }
diff --git a/chromium_src/chrome/browser/android/signin/signin_manager_android.cc b/chromium_src/chrome/browser/android/signin/signin_manager_android.cc
index 89cfb9e5005..e25c537b198 100644
--- a/chromium_src/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chromium_src/chrome/browser/android/signin/signin_manager_android.cc
@@ -12,7 +12,7 @@ namespace {
 class UnusedClass {
  private:
   void test() {
-    Java_SigninManager_create(nullptr, 0ll, nullptr, nullptr);
+    Java_SigninManager_create(nullptr, 0ll, nullptr);
   }
 };
 }  // namespace