Additional cleanup of pre-md system menu user row code.

ash/common/system/user/user_view.cc

 // Copyright 2014 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 "ash/common/system/user/user_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/multi_profile_uma.h"
-#include "ash/common/popup_message.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/user/button_from_view.h"
 #include "ash/common/system/user/login_status.h"
@@ skipping 208 matching lines @@
 
   if (IsActiveUser())
     SetBorder(base::MakeUnique<ActiveUserBorder>());
 }
 
 UserView::~UserView() {
   RemoveAddUserMenuOption();
 }
 
 TrayUser::TestState UserView::GetStateForTest() const {
-  if (add_menu_option_.get()) {
+  if (add_menu_option_)
     return add_user_enabled_ ? TrayUser::ACTIVE : TrayUser::ACTIVE_BUT_DISABLED;
-  }
 
   if (!is_user_card_button_)
     return TrayUser::SHOWN;
 
   return static_cast<ButtonFromView*>(user_card_view_)->is_hovered_for_test()
              ? TrayUser::HOVERED
              : TrayUser::SHOWN;
 }
 
 gfx::Rect UserView::GetBoundsInScreenOfUserButtonForTest() {
@@ skipping 18 matching lines @@
              IsMultiProfileSupportedAndUserActive()) {
     if (IsActiveUser()) {
       ToggleAddUserMenuOption();
     } else {
       RemoveAddUserMenuOption();
       SwitchUser(user_index_);
       // Since the user list is about to change the system menu should get
       // closed.
       owner_->system_tray()->CloseSystemBubble();
     }
-  } else if (add_menu_option_.get() &&
+  } else if (add_menu_option_ &&
              sender->GetWidget() == add_menu_option_.get()) {
     RemoveAddUserMenuOption();
     // Let the user add another account to the session.
     MultiProfileUMA::RecordSigninUser(MultiProfileUMA::SIGNIN_USER_BY_TRAY);
     WmShell::Get()->system_tray_delegate()->ShowUserLogin();
     owner_->system_tray()->CloseSystemBubble();
   } else {
     NOTREACHED();
   }
 }
@@ skipping 26 matching lines @@
         new ButtonFromView(contents_view, this,
                            IsActiveUser() ? TrayPopupInkDropStyle::INSET_BOUNDS
                                           : TrayPopupInkDropStyle::FILL_BOUNDS);
     user_card_view_ = button;
     is_user_card_button_ = true;
   }
   AddChildViewAt(user_card_view_, 0);
 }
 
 void UserView::ToggleAddUserMenuOption() {
-  if (add_menu_option_.get()) {
+  if (add_menu_option_) {
     RemoveAddUserMenuOption();
     return;
   }
 
   // Note: We do not need to install a global event handler to delete this
   // item since it will destroyed automatically before the menu / user menu item
   // gets destroyed..
   add_menu_option_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_TOOLTIP;
@@ skipping 52 matching lines @@
   }
 
   // Install a listener to focus changes so that we can remove the card when
   // the focus gets changed. When called through the destruction of the bubble,
   // the FocusManager cannot be determined anymore and we remember it here.
   focus_manager_ = user_card_view_->GetFocusManager();
   focus_manager_->AddFocusChangeListener(this);
 }
 
 void UserView::RemoveAddUserMenuOption() {
-  if (!add_menu_option_.get())
+  if (!add_menu_option_)
     return;
   focus_manager_->RemoveFocusChangeListener(this);
   focus_manager_ = nullptr;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
-  popup_message_.reset();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash