Move ownership of SigninNotificationController upstream.

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
index 6db3859ceb9d9d968f419ca797c1dabd096abb37..63aa32fccb220f54a5987165b2fcfba7a518c8d3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
@@ -25,6 +25,7 @@ import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.invalidation.InvalidationController;
+import org.chromium.chrome.browser.notifications.GoogleServicesNotificationController;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.sync.AndroidSyncSettings;
 import org.chromium.sync.internal_api.pub.base.ModelType;
@@ -66,6 +67,8 @@ public class SigninManager {
     private final ObserverList<SignInAllowedObserver> mSignInAllowedObservers =
             new ObserverList<SignInAllowedObserver>();
 
+    private final SigninNotificationController mSigninNotificationController;
+
     private Activity mSignInActivity;
     private Account mSignInAccount;
     private SignInFlowObserver mSignInFlowObserver;
@@ -164,6 +167,13 @@ public class SigninManager {
         mContext = context.getApplicationContext();
         mNativeSigninManagerAndroid = nativeInit();
         mSigninAllowedByPolicy = nativeIsSigninAllowedByPolicy(mNativeSigninManagerAndroid);
+
+        // Setup notification system for Google services. This includes both sign-in and sync.
+        GoogleServicesNotificationController controller =
+                GoogleServicesNotificationController.get(mContext);
+        mSigninNotificationController = new SigninNotificationController(
+                mContext, controller, AccountManagementFragment.class);
+        ChromeSigninController.get(mContext).addListener(mSigninNotificationController);
     }
 
     /**
@@ -230,6 +240,13 @@ public class SigninManager {
     }
 
     /**
+     * Return the SigninNotificationController.
+     */
+    public SigninNotificationController getSigninNotificationController() {
+        return mSigninNotificationController;
+    }
+
+    /**
      * Starts the sign-in flow, and executes the callback when ready to proceed.
      * <p/>
      * This method checks with the native side whether the account has management enabled, and may