Remove scoped_ptr for system tray views

ash/system/power/tray_power.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/power/tray_power.h"
 
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 172 matching lines @@
   views::Label* time_label_;
 
   PowerSupplyStatus supply_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPopupView);
 };
 
 }  // namespace tray
 
 TrayPower::TrayPower()
-    : power_(NULL),
+    : date_(NULL),
+      power_(NULL),
       power_tray_(NULL) {
 }
 
 TrayPower::~TrayPower() {
 }
 
 views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
   // There may not be enough information when this is created about whether
   // there is a battery or not. So always create this, and adjust visibility as
   // necessary.
   PowerSupplyStatus power_status =
       ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
-  power_tray_.reset(new tray::PowerTrayView());
+  CHECK(power_tray_ == NULL);
+  power_tray_ = new tray::PowerTrayView();
   power_tray_->UpdatePowerStatus(power_status);
-  return power_tray_.get();
+  return power_tray_;
 }
 
 views::View* TrayPower::CreateDefaultView(user::LoginStatus status) {
-  date_.reset(new tray::DateView());
+  CHECK(date_ == NULL);
+  date_ = new tray::DateView();
 
   views::View* container = new views::View;
   views::BoxLayout* layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
       0, 0, 0);
 
   layout->set_spread_blank_space(true);
   container->SetLayoutManager(layout);
   container->set_background(views::Background::CreateSolidBackground(
       kHeaderBackgroundColor));
   HoverHighlightView* view = new HoverHighlightView(NULL);
   view->SetLayoutManager(new views::FillLayout);
-  view->AddChildView(date_.get());
+  view->AddChildView(date_);
   date_->set_border(views::Border::CreateEmptyBorder(kPaddingVertical,
       kTrayPopupPaddingHorizontal,
       kPaddingVertical,
       kTrayPopupPaddingHorizontal));
   container->AddChildView(view);
   view->set_focusable(false);
 
   if (status != user::LOGGED_IN_NONE && status != user::LOGGED_IN_LOCKED) {
     date_->SetActionable(true);
     view->set_highlight_color(kHeaderHoverBackgroundColor);
   } else {
     view->set_highlight_color(SkColorSetARGB(0, 0, 0, 0));
   }
 
   PowerSupplyStatus power_status =
       ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
   if (power_status.battery_is_present) {
-    power_.reset(new tray::PowerPopupView());
+    CHECK(power_ == NULL);
+    power_ = new tray::PowerPopupView();
     power_->UpdatePowerStatus(power_status);
     power_->set_border(views::Border::CreateSolidSidedBorder(
         kPaddingVertical, kTrayPopupPaddingHorizontal,
         kPaddingVertical, kTrayPopupPaddingHorizontal,
         SkColorSetARGB(0, 0, 0, 0)));
-    container->AddChildView(power_.get());
+    container->AddChildView(power_);
   }
   ash::Shell::GetInstance()->tray_delegate()->RequestStatusUpdate();
 
   return container;
 }
 
 views::View* TrayPower::CreateDetailedView(user::LoginStatus status) {
   return NULL;
 }
 
 void TrayPower::DestroyTrayView() {
-  power_tray_.reset();
+  power_tray_ = NULL;
 }
 
 void TrayPower::DestroyDefaultView() {
-  date_.reset();
-  power_.reset();
+  date_ = NULL;
+  power_ = NULL;
 }
 
 void TrayPower::DestroyDetailedView() {
 }
 
 void TrayPower::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayPower::OnPowerStatusChanged(const PowerSupplyStatus& status) {
-  if (power_tray_.get())
+  if (power_tray_)
     power_tray_->UpdatePowerStatus(status);
-  if (power_.get())
+  if (power_)
     power_->UpdatePowerStatus(status);
 }
 
 }  // namespace internal
 }  // namespace ash