Remove scoped_ptr for system tray views

ash/system/user/tray_user.cc

 // Copyright (c) 2012 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/system/user/tray_user.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
@@ skipping 236 matching lines @@
   SkBitmap image_;
   SkBitmap resized_;
   gfx::Size image_size_;
   int corner_radius_;
 
   DISALLOW_COPY_AND_ASSIGN(RoundedImageView);
 };
 
 }  // namespace tray
 
-TrayUser::TrayUser() {
+TrayUser::TrayUser()
+    : user_(NULL),
+      avatar_(NULL) {
 }
 
 TrayUser::~TrayUser() {
 }
 
 views::View* TrayUser::CreateTrayView(user::LoginStatus status) {
-  avatar_.reset(new tray::RoundedImageView(kTrayRoundedBorderRadius));
+  CHECK(avatar_ == NULL);
+  avatar_ = new tray::RoundedImageView(kTrayRoundedBorderRadius);
   avatar_->set_border(views::Border::CreateEmptyBorder(0, 6, 0, 0));
   UpdateAfterLoginStatusChange(status);
-  return avatar_.get();
+  return avatar_;
 }
 
 views::View* TrayUser::CreateDefaultView(user::LoginStatus status) {
   if (status == user::LOGGED_IN_NONE)
     return NULL;
 
-  user_.reset(new tray::UserView(status));
-  return user_.get();
+  CHECK(user_ == NULL);
+  user_ = new tray::UserView(status);
+  return user_;
 }
 
 views::View* TrayUser::CreateDetailedView(user::LoginStatus status) {
   return NULL;
 }
 
 void TrayUser::DestroyTrayView() {
-  avatar_.reset();
+  avatar_ = NULL;
 }
 
 void TrayUser::DestroyDefaultView() {
-  user_.reset();
+  user_ = NULL;
 }
 
 void TrayUser::DestroyDetailedView() {
 }
 
 void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
   if (status != user::LOGGED_IN_NONE && status != user::LOGGED_IN_KIOSK &&
       status != user::LOGGED_IN_GUEST) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
         gfx::Size(kUserIconSize, kUserIconSize));
     avatar_->SetVisible(true);
   } else {
     avatar_->SetVisible(false);
   }
 }
 
 void TrayUser::OnUserUpdate() {
   avatar_->SetImage(
       ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
       gfx::Size(kUserIconSize, kUserIconSize));
 }
 
 }  // namespace internal
 }  // namespace ash