GAIA ID migration for Android

components/signin/core/browser/account_tracker_service.cc

 // 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.
 
 #include "components/signin/core/browser/account_tracker_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 236 matching lines @@
   AccountState& state = accounts_[account_id];
   if (state.info.is_child_account == is_child_account)
     return;
   state.info.is_child_account = is_child_account;
   if (state.info.IsValid())
     NotifyAccountUpdated(state);
   SaveToPrefs(state);
 }
 
 bool AccountTrackerService::IsMigratable() {
-#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   for (std::map<std::string, AccountState>::const_iterator it =
            accounts_.begin();
        it != accounts_.end(); ++it) {
     const AccountState& state = it->second;
     if ((it->first).empty() || state.info.gaia.empty())
       return false;
   }
   return true;
 #else
   return false;
@@ skipping 226 matching lines @@
     if(!ContainsKey(accounts_, info.account_id)) {
       SeedAccountInfo(info.gaia, info.email);
     }
 
     AccountState& state = accounts_[info.account_id];
     state.info = info;
     NotifyAccountUpdated(state);
     SaveToPrefs(state);
   }
 }
+
+void AccountTrackerService::RemoveAccount(const std::string& account_id) {
+  StopTrackingAccount(account_id);
+}