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

ash/system/tray/tray_notification_view.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_TRAY_NOTIFICATION_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_NOTIFICATION_VIEWS_H_
 
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/slide_out_view.h"
 
@@ skipping 14 matching lines @@
 // A view for closable notification views, laid out like:
 //  -------------------
 // | icon  contents  x |
 //  ----------------v--
 // The close button will call OnClose() when clicked.
 class TrayNotificationView : public views::SlideOutView,
                              public views::ButtonListener {
  public:
   // If icon_id is 0, no icon image will be set. SetIconImage can be called
   // to later set the icon image.
-  TrayNotificationView(SystemTrayItem* tray, int icon_id);
+  TrayNotificationView(SystemTrayItem* owner, int icon_id);
   virtual ~TrayNotificationView();
 
   // InitView must be called once with the contents to be displayed.
   void InitView(views::View* contents);
 
   // Sets/updates the icon image.
   void SetIconImage(const gfx::ImageSkia& image);
 
   // Gets the icons image.
   const gfx::ImageSkia& GetIconImage() const;
@@ skipping 17 matching lines @@
 
  protected:
   // Called when the close button is pressed. Does nothing by default.
   virtual void OnClose();
   // Called when the notification is clicked on. Does nothing by default.
   virtual void OnClickAction();
 
   // Overridden from views::SlideOutView.
   virtual void OnSlideOut() OVERRIDE;
 
-  SystemTrayItem* tray() { return tray_; }
+  SystemTrayItem* owner() { return owner_; }
 
  private:
   void HandleClose();
   void HandleClickAction();
 
-  SystemTrayItem* tray_;
+  SystemTrayItem* owner_;
   int icon_id_;
   views::ImageView* icon_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayNotificationView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_NOTIFICATION_VIEWS_H_