Cleanup: remove IdentityAccountTracker (replaced by gaia::AccountTracker)

chrome/browser/extensions/api/identity/identity_api.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "chrome/browser/extensions/api/identity/account_tracker.h"
 #include "chrome/browser/extensions/api/identity/extension_token_key.h"
 #include "chrome/browser/extensions/api/identity/gaia_web_auth_flow.h"
 #include "chrome/browser/extensions/api/identity/identity_mint_queue.h"
 #include "chrome/browser/extensions/api/identity/identity_signin_flow.h"
 #include "chrome/browser/extensions/api/identity/web_auth_flow.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
-#include "chrome/browser/signin/signin_global_error.h"
+#include "chrome/browser/signin/profile_identity_provider.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
+#include "google_apis/gaia/account_tracker.h"
 #include "google_apis/gaia/oauth2_mint_token_flow.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class GoogleServiceAuthError;
 class MockGetAuthTokenFunction;
 
 namespace content {
 class BrowserContext;
 }
 
@@ skipping 40 matching lines @@
  private:
   bool is_expired() const;
 
   CacheValueStatus status_;
   IssueAdviceInfo issue_advice_;
   std::string token_;
   base::Time expiration_time_;
 };
 
 class IdentityAPI : public BrowserContextKeyedAPI,
-                    public AccountTracker::Observer {
+                    public gaia::AccountTracker::Observer {
  public:
   typedef std::map<ExtensionTokenKey, IdentityTokenCacheValue> CachedTokens;
 
   class ShutdownObserver {
    public:
     virtual void OnShutdown() = 0;
   };
 
   explicit IdentityAPI(content::BrowserContext* context);
   virtual ~IdentityAPI();
 
   // Request serialization queue for getAuthToken.
   IdentityMintRequestQueue* mint_queue();
 
   // Token cache
   void SetCachedToken(const ExtensionTokenKey& key,
                       const IdentityTokenCacheValue& token_data);
   void EraseCachedToken(const std::string& extension_id,
                         const std::string& token);
   void EraseAllCachedTokens();
   const IdentityTokenCacheValue& GetCachedToken(const ExtensionTokenKey& key);
 
   const CachedTokens& GetAllCachedTokens();
 
   // Account queries.
   std::vector<std::string> GetAccounts() const;
   std::string FindAccountKeyByGaiaId(const std::string& gaia_id);
 
-  // Global error reporting.
-  void ReportAuthError(const GoogleServiceAuthError& error);
-  GoogleServiceAuthError GetAuthStatusForTest() const;
-
   // BrowserContextKeyedAPI implementation.
   virtual void Shutdown() OVERRIDE;
   static BrowserContextKeyedAPIFactory<IdentityAPI>* GetFactoryInstance();
 
-  // AccountTracker::Observer implementation:
-  virtual void OnAccountAdded(const AccountIds& ids) OVERRIDE;
-  virtual void OnAccountRemoved(const AccountIds& ids) OVERRIDE;
-  virtual void OnAccountSignInChanged(const AccountIds& ids,
+  // gaia::AccountTracker::Observer implementation:
+  virtual void OnAccountAdded(const gaia::AccountIds& ids) OVERRIDE;
+  virtual void OnAccountRemoved(const gaia::AccountIds& ids) OVERRIDE;
+  virtual void OnAccountSignInChanged(const gaia::AccountIds& ids,
                                       bool is_signed_in) OVERRIDE;
 
   void AddShutdownObserver(ShutdownObserver* observer);
   void RemoveShutdownObserver(ShutdownObserver* observer);
 
-  void SetAccountStateForTest(AccountIds ids, bool is_signed_in);
+  void SetAccountStateForTest(gaia::AccountIds ids, bool is_signed_in);
 
  private:
   friend class BrowserContextKeyedAPIFactory<IdentityAPI>;
 
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() { return "IdentityAPI"; }
   static const bool kServiceIsNULLWhileTesting = true;
 
   content::BrowserContext* browser_context_;
   IdentityMintRequestQueue mint_queue_;
   CachedTokens token_cache_;
-  AccountTracker account_tracker_;
+  ProfileIdentityProvider profile_identity_provider_;
+  gaia::AccountTracker account_tracker_;
   ObserverList<ShutdownObserver> shutdown_observer_list_;
 };
 
 template <>
 void BrowserContextKeyedAPIFactory<IdentityAPI>::DeclareFactoryDependencies();
 
 class IdentityGetAccountsFunction : public ChromeUIThreadExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("identity.getAccounts",
                              IDENTITY_GETACCOUNTS);
@@ skipping 192 matching lines @@
   // Helper to initialize final URL prefix.
   void InitFinalRedirectURLPrefix(const std::string& extension_id);
 
   scoped_ptr<WebAuthFlow> auth_flow_;
   GURL final_url_prefix_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IDENTITY_IDENTITY_API_H_