GAIA ID migration for Android

components/signin/core/browser/account_tracker_service.h

 // Copyright 2014 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 COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 120 matching lines @@
 
  protected:
   // Available to be called in tests.
   void SetAccountStateFromUserInfo(const std::string& account_id,
                                    const base::DictionaryValue* user_info);
   void SetIsChildAccount(const std::string& account_id,
                          const bool& is_child_account);
 
  private:
   friend class AccountFetcherService;
+  friend class AccountTrackerServiceAndroid;

[Roger Tawa OOO till Jul 10th, 2015/08/14 15:01:22]

Instead of making this a friend, let's add a new function above like:

   RemoveAccount(const std::string& account_id);

that is called from ATSAndroid.

[gogerald1, 2015/08/18 01:14:27]

Done.

   friend class FakeAccountFetcherService;
   struct AccountState {
     AccountInfo info;
   };
 
   void NotifyAccountUpdated(const AccountState& state);
   void NotifyAccountUpdateFailed(const std::string& account_id);
   void NotifyAccountRemoved(const AccountState& state);
 
   void StartTrackingAccount(const std::string& account_id);
@@ skipping 10 matching lines @@
   void SetMigrationState(AccountIdMigrationState state);
 
   SigninClient* signin_client_;  // Not owned.
   std::map<std::string, AccountState> accounts_;
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountTrackerService);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_