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

ash/system/tray/tray_item_more.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_item_more.h"
 
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "grit/ash_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 namespace internal {
 
-TrayItemMore::TrayItemMore(SystemTrayItem* owner, bool show_more)
-    : owner_(owner),
+TrayItemMore::TrayItemMore(SystemTrayItem* tray, bool show_more)
+    : tray_(tray),
       show_more_(show_more),
       icon_(NULL),
       label_(NULL),
       more_(NULL) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
       kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingBetweenItems));
 
   icon_ = new FixedSizedImageView(0, kTrayPopupItemHeight);
   AddChildView(icon_);
 
@@ skipping 30 matching lines @@
 void TrayItemMore::ReplaceIcon(views::View* view) {
   delete icon_;
   icon_ = NULL;
   AddChildViewAt(view, 0);
 }
 
 bool TrayItemMore::PerformAction(const ui::Event& event) {
   if (!show_more_)
     return false;
 
-  owner_->TransitionDetailedView();
+  tray()->TransitionDetailedView();
   return true;
 }
 
 void TrayItemMore::Layout() {
   // Let the box-layout do the layout first. Then move the '>' arrow to right
   // align.
   views::View::Layout();
 
   if (!show_more_)
     return;
@@ skipping 13 matching lines @@
   }
 }
 
 void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = accessible_name_;
 }
 
 }  // namespace internal
 }  // namespace ash