Revert 190531 "Get OAuth2TokenService working on Android."

trunk/src/chrome/browser/sync/profile_sync_service_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
 
 #include <jni.h>
 #include <map>
 
 #include "base/android/jni_helper.h"
-#include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/time.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
-#include "google_apis/gaia/google_service_auth_error.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 class Profile;
 class ProfileSyncService;
 
 // Android wrapper of the ProfileSyncService which provides access from the Java
 // layer. Note that on Android, there's only a single profile, and therefore
 // a single instance of this wrapper. The name of the Java class is
 // ProfileSyncService.
 // This class should only be accessed from the UI thread.
 class ProfileSyncServiceAndroid : public ProfileSyncServiceObserver {
  public:
-  // Callback from FetchOAuth2Token.
-  // Arguments:
-  // - the error, or NONE if the token fetch was successful.
-  // - the OAuth2 access token.
-  // - the expiry time of the token (may be null, indicating that the expiry
-  //   time is unknown.
-  typedef base::Callback<void(
-      const GoogleServiceAuthError&,const std::string&,const base::Time&)>
-          FetchOAuth2TokenCallback;
-
   ProfileSyncServiceAndroid(JNIEnv* env, jobject obj);
 
   // This method should be called once right after contructing the object.
   void Init();
 
   // Called from Java when we need to nudge native syncer. The |objectId|,
   // |version| and |payload| values should come from an invalidation.
   void NudgeSyncer(JNIEnv* env,
                    jobject obj,
                    jstring objectId,
@@ skipping 144 matching lines @@
   jboolean HasUnrecoverableError(JNIEnv* env, jobject obj);
 
   // Returns sync internals in a JSON-formatted Java string.
   base::android::ScopedJavaLocalRef<jstring> GetAboutInfoForTest(JNIEnv* env,
                                                                  jobject obj);
 
   // Returns the integer value corresponding to the current auth error state
   // (GoogleServiceAuthError.State).
   jint GetAuthError(JNIEnv* env, jobject obj);
 
-  // Called by native to invalidate an OAuth2 token, e.g. after a 401 response
-  // from the server. This should be done before fetching a new token.
-  void InvalidateOAuth2Token(const std::string& scope,
-                             const std::string& invalid_auth_token);
-
-  // Called by native when an OAuth2 token is required. |invalid_auth_token|
-  // is an old auth token to be invalidated (may be empty). |callback| will be
-  // invoked asynchronously after a new token has been fetched.
-  void FetchOAuth2Token(const std::string& scope,
-                        const FetchOAuth2TokenCallback& callback);
-
-  // Called from Java when fetching of an OAuth2 token is finished. The
-  // |authToken| param is only valid when |result| is true.
-  void OAuth2TokenFetched(JNIEnv* env,
-                          jobject obj,
-                          int callback,
-                          jstring auth_token,
-                          jboolean result);
-
   // ProfileSyncServiceObserver:
   virtual void OnStateChanged() OVERRIDE;
 
-  static ProfileSyncServiceAndroid* GetProfileSyncServiceAndroid();
-
   // Registers the ProfileSyncServiceAndroid's native methods through JNI.
   static bool Register(JNIEnv* env);
 
  private:
   virtual ~ProfileSyncServiceAndroid();
   // Remove observers to profile sync service.
   void RemoveObserver();
   void InvalidateAuthToken();
   // Called from Java when we need to nudge native syncer. The |objectId|,
   // |version| and |payload| values should come from an invalidation.
   void SendNudgeNotification(const std::string& str_object_id,
                              int64 version,
                              const std::string& payload);
 
   Profile* profile_;
   ProfileSyncService* sync_service_;
   // Java-side ProfileSyncService object.
   JavaObjectWeakGlobalRef weak_java_profile_sync_service_;
 
   // The invalidation API spec allows for the possibility of redundant
   // invalidations, so keep track of the max versions and drop
   // invalidations with old versions.
   std::map<syncer::ModelType, int64> max_invalidation_versions_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceAndroid);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_