Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/extensions/extension_assets_manager_chromeos.cc

 // Copyright (c) 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 "chrome/browser/extensions/extension_assets_manager_chromeos.h"
 
 #include <map>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 269 matching lines @@
     InstallExtensionCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const std::string& user_id = profile->GetProfileUserName();
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   if (!user_manager) {
     NOTREACHED();
     return;
   }
 
-  if (user_manager->IsUserNonCryptohomeDataEphemeral(
-          AccountId::FromUserEmail(user_id)) ||
+  if (user_manager->IsUserNonCryptohomeDataEphemeral(user_id) ||
       !user_manager->IsLoggedInAsUserWithGaiaAccount()) {
     // Don't cache anything in shared location for ephemeral user or special
     // user types.
     ExtensionAssetsManagerChromeOS::GetFileTaskRunner(profile)->PostTask(
         FROM_HERE,
         base::Bind(&ExtensionAssetsManagerChromeOS::InstallLocalExtension,
                    id,
                    version,
                    unpacked_extension_root,
                    local_install_dir,
@@ skipping 222 matching lines @@
       return false;
     }
 
     size_t num_users = users->GetSize();
     for (size_t i = 0; i < num_users; i++) {
       std::string user_id;
       if (!users->GetString(i, &user_id)) {
         NOTREACHED();
         return false;
       }
-      const user_manager::User* user =
-          user_manager->FindUser(AccountId::FromUserEmail(user_id));
+      const user_manager::User* user = user_manager->FindUser(user_id);
       bool not_used = false;
       if (!user) {
         not_used = true;
       } else if (user->is_logged_in()) {
         // For logged in user also check that this path is actually used as
         // installed extension or as delayed install.
         Profile* profile =
             chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
         ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(profile);
         if (!extension_prefs || extension_prefs->pref_service()->ReadOnly())
@@ skipping 22 matching lines @@
           std::make_pair(id, base::FilePath(shared_path)));
     } else {
       extension_info->RemoveWithoutPathExpansion(*it, NULL);
     }
   }
 
   return true;
 }
 
 }  // namespace extensions