Remove scoped_ptr for system tray views

ash/system/date/tray_date.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/date/tray_date.h"
 
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 17 matching lines @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "unicode/datefmt.h"
 #include "unicode/fieldpos.h"
 #include "unicode/fmtable.h"
 
 namespace ash {
 namespace internal {
 
-TrayDate::TrayDate() {
+TrayDate::TrayDate()
+    : time_tray_(NULL) {
 }
 
 TrayDate::~TrayDate() {
 }
 
 views::View* TrayDate::CreateTrayView(user::LoginStatus status) {
-  time_tray_.reset(new tray::TimeView());
+  CHECK(time_tray_ == NULL);
+  time_tray_ = new tray::TimeView();
   time_tray_->set_border(
       views::Border::CreateEmptyBorder(0, 10, 0, 7));
   SetupLabelForTray(time_tray_->label());
   gfx::Font font = time_tray_->label()->font();
   time_tray_->label()->SetFont(
       font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
 
   views::View* view = new TrayItemView;
-  view->AddChildView(time_tray_.get());
+  view->AddChildView(time_tray_);
   return view;
 }
 
 views::View* TrayDate::CreateDefaultView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* TrayDate::CreateDetailedView(user::LoginStatus status) {
   return NULL;
 }
 
 void TrayDate::DestroyTrayView() {
-  time_tray_.reset();
+  time_tray_ = NULL;
 }
 
 void TrayDate::DestroyDefaultView() {
 }
 
 void TrayDate::DestroyDetailedView() {
 }
 
 void TrayDate::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayDate::OnDateFormatChanged() {
-  time_tray_->UpdateTimeFormat();
+  if (time_tray_)
+    time_tray_->UpdateTimeFormat();
 }
 
 void TrayDate::Refresh() {
-  time_tray_->UpdateText();
+  if (time_tray_)
+    time_tray_->UpdateText();
 }
 
 }  // namespace internal
 }  // namespace ash