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

ash/system/drive/tray_drive.cc

Index: ash/system/drive/tray_drive.cc
diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc
index 9c59b19237f4d4ea7e2392104268f04106d6322c..7a70bebc76daac4fce2cae0bd0205088ffcb8ab5 100644
--- a/ash/system/drive/tray_drive.cc
+++ b/ash/system/drive/tray_drive.cc
@@ -9,6 +9,7 @@
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_item_more.h"
@@ -65,9 +66,9 @@ namespace tray {
 
 class DriveDefaultView : public TrayItemMore {
  public:
-  DriveDefaultView(SystemTrayItem* owner,
+  DriveDefaultView(SystemTrayItem* tray,
                    const DriveOperationStatusList* list)
-      : TrayItemMore(owner, true) {
+      : TrayItemMore(tray, true) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
     SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DRIVE).ToImageSkia());
@@ -90,9 +91,10 @@ class DriveDefaultView : public TrayItemMore {
 class DriveDetailedView : public TrayDetailsView,
                           public ViewClickListener {
  public:
-  DriveDetailedView(SystemTrayItem* owner,
+  DriveDetailedView(SystemTrayItem* tray,
                     const DriveOperationStatusList* list)
-      : settings_(NULL),
+      : TrayDetailsView(tray),
+        settings_(NULL),
         in_progress_img_(NULL),
         done_img_(NULL),
         failed_img_(NULL) {
@@ -356,7 +358,7 @@ class DriveDetailedView : public TrayDetailsView,
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     if (sender == footer()->content()) {
-      Shell::GetInstance()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+      tray()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == settings_) {
       delegate->ShowDriveSettings();
     }
@@ -374,8 +376,8 @@ class DriveDetailedView : public TrayDetailsView,
 
 }  // namespace tray
 
-TrayDrive::TrayDrive() :
-    TrayImageItem(IDR_AURA_UBER_TRAY_DRIVE_LIGHT),
+TrayDrive::TrayDrive(SystemTray* system_tray) :
+    TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_DRIVE_LIGHT),
     default_(NULL),
     detailed_(NULL) {
 }