Remove scoped_ptr for system tray views

ash/system/brightness/tray_brightness.cc

Index: ash/system/brightness/tray_brightness.cc
diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc
index fd75528d6500e5548ed9e0ecfb401fcbf65680c5..b52e97855ae436059d6992a6fadd83a3d38f931a 100644
--- a/ash/system/brightness/tray_brightness.cc
+++ b/ash/system/brightness/tray_brightness.cc
@@ -125,6 +125,7 @@ class BrightnessView : public views::View,
 
 TrayBrightness::TrayBrightness()
     : weak_ptr_factory_(this),
+      brightness_view_(NULL),
       is_default_view_(false),
       current_percent_(100.0),
       got_current_percent_(false) {
@@ -160,15 +161,17 @@ views::View* TrayBrightness::CreateTrayView(user::LoginStatus status) {
 }
 
 views::View* TrayBrightness::CreateDefaultView(user::LoginStatus status) {
-  brightness_view_.reset(new tray::BrightnessView(current_percent_));
+  CHECK(brightness_view_ == NULL);
+  brightness_view_ = new tray::BrightnessView(current_percent_);
   is_default_view_ = true;
-  return brightness_view_.get();
+  return brightness_view_;
 }
 
 views::View* TrayBrightness::CreateDetailedView(user::LoginStatus status) {
-  brightness_view_.reset(new tray::BrightnessView(current_percent_));
+  CHECK(brightness_view_ == NULL);
+  brightness_view_ = new tray::BrightnessView(current_percent_);
   is_default_view_ = false;
-  return brightness_view_.get();
+  return brightness_view_;
 }
 
 void TrayBrightness::DestroyTrayView() {
@@ -176,12 +179,12 @@ void TrayBrightness::DestroyTrayView() {
 
 void TrayBrightness::DestroyDefaultView() {
   if (is_default_view_)
-    brightness_view_.reset();
+    brightness_view_ = NULL;
 }
 
 void TrayBrightness::DestroyDetailedView() {
   if (!is_default_view_)
-    brightness_view_.reset();
+    brightness_view_ = NULL;
 }
 
 void TrayBrightness::UpdateAfterLoginStatusChange(user::LoginStatus status) {
@@ -191,12 +194,12 @@ void TrayBrightness::OnBrightnessChanged(double percent, bool user_initiated) {
   current_percent_ = percent;
   got_current_percent_ = true;
 
-  if (brightness_view_.get())
+  if (brightness_view_)
     brightness_view_->SetBrightnessPercent(percent);
   if (!user_initiated)
     return;
 
-  if (brightness_view_.get())
+  if (brightness_view_)
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
   else
     PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);