Revert 113789 - [cros] Use a distinct icon for the guest session.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 113796)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -459,10 +459,6 @@
   return browser_->profile()->IsOffTheRecord();
 }
 
-bool BrowserView::IsGuestSession() const {
-  return browser_->profile()->IsGuestSession();
-}
-
 bool BrowserView::ShouldShowAvatar() const {
   if (!IsBrowserTypeNormal())
     return false;
@@ -549,7 +545,7 @@
   return browser_->GetSelectedTabContentsWrapper();
 }
 
-SkBitmap BrowserView::GetOTRAvatarIcon() const {
+SkBitmap BrowserView::GetOTRAvatarIcon() {
   static SkBitmap* otr_avatar_ = new SkBitmap();
 
   if (otr_avatar_->isNull()) {
@@ -559,21 +555,6 @@
   return *otr_avatar_;
 }
 
-SkBitmap BrowserView::GetGuestAvatarIcon() const {
-#if defined(OS_CHROMEOS)
-  static SkBitmap* guest_avatar_ = new SkBitmap();
-
-  if (guest_avatar_->isNull()) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    *guest_avatar_ = *rb.GetBitmapNamed(IDR_GUEST_ICON);
-  }
-  return *guest_avatar_;
-#else
-  NOTREACHED();
-  return SkBitmap();
-#endif
-}
-
 #if defined(OS_WIN) && !defined(USE_AURA)
 void BrowserView::PrepareToRunSystemMenu(HMENU menu) {
   system_menu_->UpdateStates();