ash: Fix a screen-locking crash.

chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc

Index: chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc
index def0e0bb76421b2c95362dc14faff2c0642f8f8d..84bec474d70b331ba54accc5e1542f281848ad5f 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc
@@ -9,6 +9,7 @@
 #include "base/metrics/statistics_recorder.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "components/user_manager/user.h"
 
 namespace extensions {
 
@@ -40,11 +41,9 @@ FeedbackServiceImpl::~FeedbackServiceImpl() {
 }
 
 std::string FeedbackServiceImpl::GetUserEmail() {
-  chromeos::UserManager* manager = chromeos::UserManager::Get();
-  if (!manager)
-    return std::string();
-  else
-    return manager->GetLoggedInUser()->display_email();
+  const chromeos::UserManager* manager = chromeos::UserManager::Get();
+  const user_manager::User* user = manager ? manager->GetActiveUser() : NULL;

[oshima, 2014/08/01 23:29:58]

can you update the CL description?

[Daniel Erat, 2014/08/01 23:52:06]

sorry, didn't mean for this to creep in. re-uploaded the change

+  return user ? user->display_email() : std::string();
 }
 
 void FeedbackServiceImpl::GetHistograms(std::string* histograms) {