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

ash/system/locale/tray_locale.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/locale/tray_locale.h"
 
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_notification_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/string16.h"
@@ skipping 55 matching lines @@
   }
 
  private:
   LocaleObserver::Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(LocaleMessageView);
 };
 
 class LocaleNotificationView : public TrayNotificationView {
  public:
-  LocaleNotificationView(TrayLocale* tray,
+  LocaleNotificationView(TrayLocale* owner,
                          LocaleObserver::Delegate* delegate,
                          const std::string& cur_locale,
                          const std::string& from_locale,
                          const std::string& to_locale)
-      : TrayNotificationView(tray, IDR_AURA_UBER_TRAY_LOCALE),
+      : TrayNotificationView(owner, IDR_AURA_UBER_TRAY_LOCALE),
         delegate_(delegate) {
     views::View* container = new LocaleMessageView(
         delegate, cur_locale, from_locale, to_locale);
     InitView(container);
   }
 
   void Update(LocaleObserver::Delegate* delegate,
               const std::string& cur_locale,
               const std::string& from_locale,
               const std::string& to_locale) {
@@ skipping 10 matching lines @@
   }
 
  private:
   LocaleObserver::Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(LocaleNotificationView);
 };
 
 }  // namespace tray
 
-TrayLocale::TrayLocale()
-    : notification_(NULL),
+TrayLocale::TrayLocale(SystemTray* system_tray)
+    : SystemTrayItem(system_tray),
+      notification_(NULL),
       delegate_(NULL) {
 }
 
 TrayLocale::~TrayLocale() {
 }
 
 views::View* TrayLocale::CreateNotificationView(user::LoginStatus status) {
   if (!delegate_)
     return NULL;
   CHECK(notification_ == NULL);
@@ skipping 15 matching lines @@
   from_locale_ = from_locale;
   to_locale_ = to_locale;
   if (notification_)
     notification_->Update(delegate, cur_locale_, from_locale_, to_locale_);
   else
     ShowNotificationView();
 }
 
 }  // namespace internal
 }  // namespace ash