[Sync] Switch to using GoogleAuthUtil.clearToken().

sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java

 // Copyright 2012 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.sync.signin;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorDescription;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Context;
 import android.os.AsyncTask;
-import android.os.StrictMode;
 import android.os.SystemClock;
 
 import com.google.android.gms.auth.GoogleAuthException;
 import com.google.android.gms.auth.GoogleAuthUtil;
+import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
 import com.google.android.gms.auth.UserRecoverableAuthException;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.MainDex;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.metrics.RecordHistogram;
 
 import java.io.IOException;
@@ skipping 51 matching lines @@
         } catch (UserRecoverableAuthException ex) {
             throw new AuthException(false /* isTransientError */, ex.getIntent(), ex);
         } catch (GoogleAuthException ex) {
             throw new AuthException(false /* isTransientError */, null, ex);
         } catch (IOException ex) {
             throw new AuthException(true /* isTransientError */, null, ex);
         }
     }
 
     @Override
-    public void invalidateAuthToken(String accountType, String authToken) {
-        // Temporarily allowing disk access while fixing. TODO: http://crbug.com/535320
-        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
-        StrictMode.allowThreadDiskReads();
+    public void invalidateAuthToken(String authToken) throws AuthException {
         try {
-            mAccountManager.invalidateAuthToken(accountType, authToken);
-        } finally {
-            StrictMode.setThreadPolicy(oldPolicy);
+            GoogleAuthUtil.clearToken(mApplicationContext, authToken);
+        } catch (GooglePlayServicesAvailabilityException ex) {
+            throw new AuthException(false /* isTransientError */, null, ex);
+        } catch (GoogleAuthException ex) {
+            throw new AuthException(false /* isTransientError */, null, ex);
+        } catch (IOException ex) {
+            throw new AuthException(true /* isTransientError */, null, ex);
         }
     }
 
     @Override
     public AuthenticatorDescription[] getAuthenticatorTypes() {
         return mAccountManager.getAuthenticatorTypes();
     }
 
     @Override
     public void hasFeatures(Account account, String[] features, final Callback<Boolean> callback) {
@@ skipping 29 matching lines @@
      * process has been initialized.
      *
      * @param histogramName the name of the histogram.
      * @param elapsedMs the elapsed time in milliseconds.
      */
     protected static void recordElapsedTimeHistogram(String histogramName, long elapsedMs) {
         if (!LibraryLoader.isInitialized()) return;
         RecordHistogram.recordTimesHistogram(histogramName, elapsedMs, TimeUnit.MILLISECONDS);
     }
 }