Revert of Use user manager instead of profile to determine user id. (https://codereview.chromium.org/142163003/)

Reason for revert:
Test failures on Linux ChromiumOS Tests (dbg)(2):

http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%282%29/builds/10207/steps/browser_tests/logs/stdio

[ RUN      ] BrowserGuestSessionNavigatorTest.Browser_Gets_Created_On_Visiting_Desktop
[28580:28611:0121/153117:12151177899:ERROR:nss_cert_database.cc(58)] NSSCertDatabase::GetInstance() is deprecated.See http://crbug.com/329735.
Xlib:  extension "RANDR" missing on display ":9".
[28580:28580:0121/153117:12151450597:WARNING:profile_helper.cc(200)] Switching to profile path: /tmp/.org.chromium.Chromium.ARxmRr/dEIbLcR/u-user
[28580:28624:0121/153117:12151550387:WARNING:nss_util.cc(440)] using software private slot for user
[28580:28580:0121/153117:12151781518:WARNING:profile_io_data.cc(362)] no username_hash
[28580:28580:0121/153118:12151845359:WARNING:profile_io_data.cc(362)] no username_hash
[28580:28618:0121/153118:12151883267:ERROR:external_metrics.cc(98)] Couldn't write to /home/chronos/.progressive_scan_variation
[28633:28633:0121/233118:WARNING:sandbox_linux.cc(40)] Activated seccomp-bpf sandbox for process type: gpu-process.
[7:7:0121/153118:WARNING:sandbox_linux.cc(40)] Activated seccomp-bpf sandbox for process type: renderer.
[28580:28580:0121/153118:12152616173:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28580:28580:0121/153118:12152619390:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28580:28580:0121/153118:12152619421:WARNING:proxy_config_service_impl.cc(136)] Unknown profile_path '/profile/default'. Ignoring proxy.
[28580:28580:0121/153118:12152619619:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28580:28580:0121/153118:12152619647:WARNING:proxy_config_service_impl.cc(136)] Unknown profile_path '/profile/default'. Ignoring proxy.
[28580:28580:0121/153118:12152619796:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28580:28580:0121/153118:12152619914:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28580:28624:0121/153118:12152749194:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[28580:28624:0121/153118:12152751748:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[28580:28624:0121/153118:12152753919:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[28580:28624:0121/153118:12152754715:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[28580:28580:0121/153119:12153272532:FATAL:gaia_auth_util.cc(26)] Check failed: false. expecting exactly one @, but got 1
 [0x7f0a3bb79504] base::debug::StackTrace::StackTrace()
 [0x7f0a3bbe7523] logging::LogMessage::~LogMessage()
 [0x0000044bd000] gaia::CanonicalizeEmail()
 [0x000002fc977f] options::BrowserOptionsHandler::GetLocalizedValues()
 [0x000002e1d566] options::OptionsUI::AddOptionsPageUIHandler()
 [0x000002e1c637] options::OptionsUI::OptionsUI()
 [0x000002d0fcd1] (anonymous namespace)::NewWebUI<>()
 [0x000002d0ec5d] ChromeWebUIControllerFactory::CreateWebUIControllerForURL()
 [0x7f0a324c43e5] content::WebUIControllerFactoryRegistry::CreateWebUIControllerForURL()
 [0x7f0a3248061f] content::WebContentsImpl::CreateWebUI()
 [0x000002e5e676] UberUI::RegisterSubpage()
 [0x000002e5e513] UberUI::UberUI()
 [0x000002d0fdf4] (anonymous namespace)::NewWebUI<>()
 [0x000002d0ec5d] ChromeWebUIControllerFactory::CreateWebUIControllerForURL()
 [0x7f0a324c43e5] content::WebUIControllerFactoryRegistry::CreateWebUIControllerForURL()
 [0x7f0a3248061f] content::WebContentsImpl::CreateWebUI()
 [0x7f0a3248d0f0] content::WebContentsImpl::CreateWebUIForRenderManager()
 [0x7f0a31fd72f9] content::RenderFrameHostManager::SetPendingWebUI()
 [0x7f0a31fdb102] content::RenderFrameHostManager::UpdateRendererStateForNavigate()
 [0x7f0a31fd74a0] content::RenderFrameHostManager::Navigate()
 [0x7f0a32484e3b] content::WebContentsImpl::NavigateToEntry()
 [0x7f0a3248486e] content::WebContentsImpl::NavigateToPendingEntry()
 [0x7f0a31fc0aea] content::NavigationControllerImpl::NavigateToPendingEntry()
 [0x7f0a31fbbc68] content::NavigationControllerImpl::LoadEntry()
 [0x7f0a31fbd1f1] content::NavigationControllerImpl::LoadURLWithParams()
 [0x000002b4719f] (anonymous namespace)::LoadURLInContents()
 [0x000002b48472] chrome::Navigate()
 [0x00000153749b] (anonymous namespace)::BrowserGuestSessionNavigatorTest_Browser_Gets_Created_On_Visiting_Desktop_Test::RunTestOnMainThread()
 [0x000002890084] InProcessBrowserTest::RunTestOnMainThreadLoop()
 [0x000004692745] content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
 [0x000004693524] base::internal::RunnableAdapter<>::Run()
 [0x000004693470] base::internal::InvokeHelper<>::MakeItSo()
 [0x00000469338b] base::internal::Invoker<>::Run()
 [0x000000c252bd] base::Callback<>::Run()
 [0x00000493cb59] ChromeBrowserMainParts::PreMainMessageLoopRunImpl()
 [0x00000493af3e] ChromeBrowserMainParts::PreMainMessageLoopRun()
 [0x000003f40b3d] chromeos::ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun()
 [0x7f0a31df3318] content::BrowserMainLoop::PreMainMessageLoopRun()
 [0x7f0a31dfa9a2] base::internal::RunnableAdapter<>::Run()
 [0x7f0a31dfa598] base::internal::InvokeHelper<>::MakeItSo()
 [0x7f0a31df9f65] base::internal::Invoker<>::Run()
 [0x7f0a321b57fd] base::Callback<>::Run()
 [0x7f0a324472de] content::StartupTaskRunner::RunAllTasksNow()
 [0x7f0a31df2ad0] content::BrowserMainLoop::CreateStartupTasks()
 [0x7f0a31dfb468] content::BrowserMainRunnerImpl::Initialize()
 [0x7f0a31def263] content::BrowserMain()
 [0x0000046926ac] content::BrowserTestBase::SetUp()
 [0x00000288f1fc] InProcessBrowserTest::SetUp()
 [0x0000029bdd48] testing::internal::HandleSehExceptionsInMethodIfSupported<>()
 [0x0000029b9f25] testing::internal::HandleExceptionsInMethodIfSupported<>()
 [0x0000029ae9e7] testing::Test::Run()
 [0x0000029af062] testing::TestInfo::Run()
 [0x0000029af5bd] testing::TestCase::Run()
 [0x0000029b402f] testing::internal::UnitTestImpl::RunAllTests()
 [0x0000029beef3] testing::internal::HandleSehExceptionsInMethodIfSupported<>()
 [0x0000029bacab] testing::internal::HandleExceptionsInMethodIfSupported<>()
 [0x0000029b301d] testing::UnitTest::Run()
 [0x0000028b3217] RUN_ALL_TESTS()
 [0x0000028b2d30] base::TestSuite::Run()
 [0x00000288cb37] (anonymous namespace)::ChromeTestLauncherDelegate::RunTestSuite()
 [0x0000046e623b] content::LaunchTests()
 [0x00000288cea0] LaunchChromeTests()

[3483/3485] BrowserGuestSessionNavigatorTest.Browser_Gets_Created_On_Visiting_Desktop (4981 ms)
[3484/3485] AppListStartPageWebUITest.Basic (5244 ms)
[0121/153125:ERROR:kill_posix.cc(190)] Unable to terminate process group 28715: No such process
[ RUN      ] BrowserGuestSessionNavigatorTest.Disposition_Settings_UseIncognitoWindow
[28715:28728:0121/153122:12156227569:ERROR:nss_cert_database.cc(58)] NSSCertDatabase::GetInstance() is deprecated.See http://crbug.com/329735.
Xlib:  extension "RANDR" missing on display ":9".
[28715:28715:0121/153122:12156435185:WARNING:profile_helper.cc(200)] Switching to profile path: /tmp/.org.chromium.Chromium.ARxmRr/d5A0GM9/u-user
[28715:28738:0121/153122:12156536560:WARNING:nss_util.cc(440)] using software private slot for user
[28715:28715:0121/153122:12156740653:WARNING:profile_io_data.cc(362)] no username_hash
[28715:28715:0121/153122:12156775609:WARNING:profile_io_data.cc(362)] no username_hash
[28715:28734:0121/153123:12156798807:ERROR:external_metrics.cc(98)] Couldn't write to /home/chronos/.progressive_scan_variation
[7:7:0121/153123:WARNING:sandbox_linux.cc(40)] Activated seccomp-bpf sandbox for process type: renderer.
[28742:28742:0121/233123:WARNING:sandbox_linux.cc(40)] Activated seccomp-bpf sandbox for process type: gpu-process.
[28715:28715:0121/153123:12157527177:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28715:28715:0121/153123:12157530574:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28715:28715:0121/153123:12157530605:WARNING:proxy_config_service_impl.cc(136)] Unknown profile_path '/profile/default'. Ignoring proxy.
[28715:28715:0121/153123:12157530819:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28715:28715:0121/153123:12157530847:WARNING:proxy_config_service_impl.cc(136)] Unknown profile_path '/profile/default'. Ignoring proxy.
[28715:28715:0121/153123:12157531003:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28715:28715:0121/153123:12157531119:WARNING:proxy_config_handler.cc(71)] Unknown profile_path '/profile/default'.
[28715:28738:0121/153123:12157632123:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[28715:28738:0121/153123:12157633507:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[28715:28738:0121/153123:12157634314:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[28715:28738:0121/153123:12157635293:ERROR:gpu_message_filter.cc(174)] Renderer 3 tried to access a surface for renderer 0
[15:15:0121/153124:WARNING:sandbox_linux.cc(40)] Activated seccomp-bpf sandbox for process type: renderer.
[28715:28738:0121/153124:12158416479:ERROR:gpu_message_filter.cc(174)] Renderer 4 tried to access a surface for renderer 0
[28715:28738:0121/153124:12158418414:ERROR:gpu_message_filter.cc(174)] Renderer 4 tried to access a surface for renderer 0
[28715:28738:0121/153124:12158419450:ERROR:gpu_message_filter.cc(174)] Renderer 4 tried to access a surface for renderer 0
[28715:28738:0121/153124:12158420499:ERROR:gpu_message_filter.cc(174)] Renderer 4 tried to access a surface for renderer 0
[28715:28715:0121/153124:12158544351:FATAL:gaia_auth_util.cc(26)] Check failed: false. expecting exactly one @, but got 1
 [0x7f9311b86504] base::debug::StackTrace::StackTrace()
 [0x7f9311bf4523] logging::LogMessage::~LogMessage()
 [0x0000044bd000] gaia::CanonicalizeEmail()
 [0x000002fc977f] options::BrowserOptionsHandler::GetLocalizedValues()
 [0x000002e1d566] options::OptionsUI::AddOptionsPageUIHandler()
 [0x000002e1c637] options::OptionsUI::OptionsUI()
 [0x000002d0fcd1] (anonymous namespace)::NewWebUI<>()
 [0x000002d0ec5d] ChromeWebUIControllerFactory::CreateWebUIControllerForURL()
 [0x7f93084d13e5] content::WebUIControllerFactoryRegistry::CreateWebUIControllerForURL()
 [0x7f930848d61f] content::WebContentsImpl::CreateWebUI()
 [0x000002e5e676] UberUI::RegisterSubpage()
 [0x000002e5e513] UberUI::UberUI()
 [0x000002d0fdf4] (anonymous namespace)::NewWebUI<>()
 [0x000002d0ec5d] ChromeWebUIControllerFactory::CreateWebUIControllerForURL()
 [0x7f93084d13e5] content::WebUIControllerFactoryRegistry::CreateWebUIControllerForURL()
 [0x7f930848d61f] content::WebContentsImpl::CreateWebUI()
 [0x7f930849a0f0] content::WebContentsImpl::CreateWebUIForRenderManager()
 [0x7f9307fe42f9] content::RenderFrameHostManager::SetPendingWebUI()
 [0x7f9307fe8102] content::RenderFrameHostManager::UpdateRendererStateForNavigate()
 [0x7f9307fe44a0] content::RenderFrameHostManager::Navigate()
 [0x7f9308491e3b] content::WebContentsImpl::NavigateToEntry()
 [0x7f930849186e] content::WebContentsImpl::NavigateToPendingEntry()
 [0x7f9307fcdaea] content::NavigationControllerImpl::NavigateToPendingEntry()
 [0x7f9307fc8c68] content::NavigationControllerImpl::LoadEntry()
 [0x7f9307fca1f1] content::NavigationControllerImpl::LoadURLWithParams()
 [0x000002b4719f] (anonymous namespace)::LoadURLInContents()
 [0x000002b48472] chrome::Navigate()
 [0x000001536e01] (anonymous namespace)::BrowserGuestSessionNavigatorTest_Disposition_Settings_UseIncognitoWindow_Test::RunTestOnMainThread()
 [0x000002890084] InProcessBrowserTest::RunTestOnMainThreadLoop()
 [0x000004692745] content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
 [0x000004693524] base::internal::RunnableAdapter<>::Run()
 [0x000004693470] base::internal::InvokeHelper<>::MakeItSo()
 [0x00000469338b] base::internal::Invoker<>::Run()
 [0x000000c252bd] base::Callback<>::Run()
 [0x00000493cb59] ChromeBrowserMainParts::PreMainMessageLoopRunImpl()
 [0x00000493af3e] ChromeBrowserMainParts::PreMainMessageLoopRun()
 [0x000003f40b3d] chromeos::ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun()
 [0x7f9307e00318] content::BrowserMainLoop::PreMainMessageLoopRun()
 [0x7f9307e079a2] base::internal::RunnableAdapter<>::Run()
 [0x7f9307e07598] base::internal::InvokeHelper<>::MakeItSo()
 [0x7f9307e06f65] base::internal::Invoker<>::Run()
 [0x7f93081c27fd] base::Callback<>::Run()
 [0x7f93084542de] content::StartupTaskRunner::RunAllTasksNow()
 [0x7f9307dffad0] content::BrowserMainLoop::CreateStartupTasks()
 [0x7f9307e08468] content::BrowserMainRunnerImpl::Initialize()
 [0x7f9307dfc263] content::BrowserMain()
 [0x0000046926ac] content::BrowserTestBase::SetUp()
 [0x00000288f1fc] InProcessBrowserTest::SetUp()
 [0x0000029bdd48] testing::internal::HandleSehExceptionsInMethodIfSupported<>()
 [0x0000029b9f25] testing::internal::HandleExceptionsInMethodIfSupported<>()
 [0x0000029ae9e7] testing::Test::Run()
 [0x0000029af062] testing::TestInfo::Run()
 [0x0000029af5bd] testing::TestCase::Run()
 [0x0000029b402f] testing::internal::UnitTestImpl::RunAllTests()
 [0x0000029beef3] testing::internal::HandleSehExceptionsInMethodIfSupported<>()
 [0x0000029bacab] testing::internal::HandleExceptionsInMethodIfSupported<>()
 [0x0000029b301d] testing::UnitTest::Run()
 [0x0000028b3217] RUN_ALL_TESTS()
 [0x0000028b2d30] base::TestSuite::Run()
 [0x00000288cb37] (anonymous namespace)::ChromeTestLauncherDelegate::RunTestSuite()
 [0x0000046e623b] content::LaunchTests()
 [0x00000288cea0] LaunchChromeTests()

Original issue's description:
> Use user manager instead of profile to determine user id.
> 
> BUG=333037
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246047

TBR=nkostylev@chromium.org,antrim@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=333037

Review URL: https://codereview.chromium.org/136343003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246306 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 995714c..a92334e 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -100,7 +100,6 @@
 #include "ash/magnifier/magnifier_constants.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
-#include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -480,11 +479,9 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
 
 #if defined(OS_CHROMEOS)
   Profile* profile = Profile::FromWebUI(web_ui());
-  chromeos::User* user =
-      chromeos::UserManager::Get()->GetUserByProfile(profile);
-  std::string username;
-  if (user)
-      username = gaia::SanitizeEmail(gaia::CanonicalizeEmail(user->email()));
+  std::string name = profile->GetProfileName();
+  std::string username =
+      name.empty() ? name : gaia::SanitizeEmail(gaia::CanonicalizeEmail(name));
   values->SetString("username", username);
 #endif