[Prototype] Delete Google service worker caches on Android signout

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ skipping 522 matching lines @@
 
         // Native signout must happen before resetting the account so data is deleted correctly.
         // http://crbug.com/589028
         nativeSignOut(mNativeSigninManagerAndroid);
         ChromeSigninController.get().setSignedInAccountName(null);
         AndroidSyncSettings.updateAccount(mContext, null);
 
         if (wipeData) {
             wipeProfileData(wipeDataHooks);
         } else {
-            onSignOutDone();
+            wipeGoogleServiceWorkers(wipeDataHooks);

[gogerald1, 2017/07/13 17:08:22]

nit:WipeGoogleServiceWorkerCaches?

[msramek, 2017/07/13 19:09:12]

Done. Missed this :)

         }
 
         AccountTrackerService.get().invalidateAccountSeedStatus(true);
     }
 
     /**
      * Returns the management domain if the signed in account is managed, otherwise returns null.
      */
     public String getManagementDomain() {
         return nativeGetManagementDomain(mNativeSigninManagerAndroid);
@@ skipping 31 matching lines @@
         Log.d(TAG, "Signin flow aborted.");
         notifySignInAllowedChanged();
     }
 
     private void wipeProfileData(WipeDataHooks hooks) {
         if (hooks != null) hooks.preWipeData();
         // This will call back to onProfileDataWiped().
         nativeWipeProfileData(mNativeSigninManagerAndroid, hooks);
     }
 
+    private void wipeGoogleServiceWorkers(WipeDataHooks hooks) {
+        if (hooks != null) hooks.preWipeData();
+        // This will call back to onProfileDataWiped().
+        nativeWipeGoogleServiceWorkerCaches(mNativeSigninManagerAndroid, hooks);
+    }
+
     /**
      * Convenience method to return a Promise to be fulfilled when the user's sync data has been
      * wiped if the parameter is true, or an already fulfilled Promise if the parameter is false.
      */
     public static Promise<Void> wipeSyncUserDataIfRequired(boolean required) {
         if (required) {
             return SyncUserDataWiper.wipeSyncUserData();
         } else {
             return Promise.fulfilled(null);
         }
@@ skipping 67 matching lines @@
     private native boolean nativeIsSigninAllowedByPolicy(long nativeSigninManagerAndroid);
     private native boolean nativeIsForceSigninEnabled(long nativeSigninManagerAndroid);
     private native void nativeCheckPolicyBeforeSignIn(
             long nativeSigninManagerAndroid, String username);
     private native void nativeFetchPolicyBeforeSignIn(long nativeSigninManagerAndroid);
     private native void nativeAbortSignIn(long nativeSigninManagerAndroid);
     private native void nativeOnSignInCompleted(long nativeSigninManagerAndroid, String username);
     private native void nativeSignOut(long nativeSigninManagerAndroid);
     private native String nativeGetManagementDomain(long nativeSigninManagerAndroid);
     private native void nativeWipeProfileData(long nativeSigninManagerAndroid, WipeDataHooks hooks);
+    private native void nativeWipeGoogleServiceWorkerCaches(
+            long nativeSigninManagerAndroid, WipeDataHooks hooks);
     private native void nativeClearLastSignedInUser(long nativeSigninManagerAndroid);
     private native void nativeLogInSignedInUser(long nativeSigninManagerAndroid);
     private native boolean nativeIsSignedInOnNative(long nativeSigninManagerAndroid);
     private native void nativeProhibitSignout(
             long nativeSigninManagerAndroid, boolean prohibitSignout);
 }