Merge 287309 "Use the display name on ChromeOS instead of the pr..."

chrome/browser/supervised_user/supervised_user_service.h

Index: chrome/browser/supervised_user/supervised_user_service.h
===================================================================
--- chrome/browser/supervised_user/supervised_user_service.h	(revision 290568)
+++ chrome/browser/supervised_user/supervised_user_service.h	(working copy)
@@ -251,6 +251,9 @@
   // corresponding preference is changed.
   void UpdateManualURLs();
 
+  // Returns the human readable name of the supervised user.
+  std::string GetSupervisedUserName() const;
+
   // Owns us via the KeyedService mechanism.
   Profile* profile_;