This CL replaces user_manager::UserID with AccountId.

chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 111 matching lines @@
     return;
   }
 
   ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS);
 
   base::StringValue canonical_email(gaia::CanonicalizeEmail(email));
   if (OwnerSettingsServiceChromeOS* service =
           OwnerSettingsServiceChromeOS::FromWebUI(web_ui())) {
     service->RemoveFromList(kAccountsPrefUsers, canonical_email);
   }
-  user_manager::UserManager::Get()->RemoveUser(email, NULL);
+  user_manager::UserManager::Get()->RemoveUser(AccountId::FromUserEmail(email),
+                                               nullptr);
 }
 
 void AccountsOptionsHandler::HandleUpdateWhitelist(
     const base::ListValue* args) {
   DCHECK(args && args->empty());
 
   // Creates one list to set. This is needed because user white list update is
   // asynchronous and sequential. Before previous write comes back, cached list
   // is stale and should not be used for appending. See http://crbug.com/127215
   scoped_ptr<base::ListValue> new_list;
@@ skipping 26 matching lines @@
     new_list->AppendIfNotPresent(new base::StringValue((*it)->email()));
 
   if (OwnerSettingsServiceChromeOS* service =
           OwnerSettingsServiceChromeOS::FromWebUI(web_ui())) {
     service->Set(kAccountsPrefUsers, *new_list.get());
   }
 }
 
 }  // namespace options
 }  // namespace chromeos