Remove scoped_ptr for system tray views

ash/system/brightness/tray_brightness.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/brightness/tray_brightness.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ash/system/brightness/brightness_control_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 107 matching lines @@
   // Last brightness level that we observed, in the range [0.0, 100.0].
   double last_percent_;
 
   DISALLOW_COPY_AND_ASSIGN(BrightnessView);
 };
 
 }  // namespace tray
 
 TrayBrightness::TrayBrightness()
     : weak_ptr_factory_(this),
+      brightness_view_(NULL),
       is_default_view_(false),
       current_percent_(100.0),
       got_current_percent_(false) {
   // Post a task to get the initial brightness; the BrightnessControlDelegate
   // isn't created yet.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       base::Bind(&TrayBrightness::GetInitialBrightness,
                  weak_ptr_factory_.GetWeakPtr()));
 }
@@ skipping 15 matching lines @@
 void TrayBrightness::HandleInitialBrightness(double percent) {
   if (!got_current_percent_)
     OnBrightnessChanged(percent, false);
 }
 
 views::View* TrayBrightness::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
 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() {
 }
 
 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) {
 }
 
 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);
 }
 
 }  // namespace internal
 }  // namespace ash