Stop using shell::GetInstance()->system_tray() in system tray items

ash/system/tray/tray_notification_view.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/tray/tray_notification_view.h"
 
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace {
 
 const int kNotificationButtonWidth = 32;
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
-TrayNotificationView::TrayNotificationView(SystemTrayItem* tray, int icon_id)
-    : tray_(tray),
+TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id)
+    : owner_(owner),
       icon_id_(icon_id),
       icon_(NULL) {
 }
 
 TrayNotificationView::~TrayNotificationView() {
 }
 
 void TrayNotificationView::InitView(views::View* contents) {
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
@@ skipping 95 matching lines @@
   return ui::ER_CONSUMED;
 }
 
 void TrayNotificationView::OnClose() {
 }
 
 void TrayNotificationView::OnClickAction() {
 }
 
 void TrayNotificationView::OnSlideOut() {
-  tray_->HideNotificationView();
+  owner_->HideNotificationView();
 }
 
 void TrayNotificationView::HandleClose() {
   OnClose();
-  tray_->HideNotificationView();
+  owner_->HideNotificationView();
 }
 
 void TrayNotificationView::HandleClickAction() {
   HandleClose();
   OnClickAction();
 }
 
 }  // namespace internal
 }  // namespace ash