Revert of Add account_type into AccountId

chrome/browser/ui/webui/options/chromeos/user_image_source.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/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_images.h"
@@ skipping 20 matching lines @@
       net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS |
           net::UnescapeRule::PATH_SEPARATORS | net::UnescapeRule::SPACES);
   AccountId account_id(EmptyAccountId());
   const bool status =
       AccountId::Deserialize(serialized_account_id, &account_id);
   // TODO(alemate): DCHECK(status) - should happen after options page is
   // migrated.
   if (!status) {
     LOG(WARNING) << "Failed to deserialize account_id.";
     account_id = user_manager::known_user::GetAccountId(
-        serialized_account_id, std::string() /* id */, AccountType::UNKNOWN);
+        serialized_account_id, std::string() /* gaia_id */);
   }
   *email = account_id.GetUserEmail();
 }
 
 scoped_refptr<base::RefCountedMemory> GetUserImageInternal(
     const AccountId& account_id) {
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(account_id);
 
   // Always use the 100% scaling. These source images are 256x256, and are
@@ skipping 51 matching lines @@
 }
 
 std::string UserImageSource::GetMimeType(const std::string& path) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 }  // namespace options
 }  // namespace chromeos