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

ash/system/tray/system_tray_item.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/system_tray_item.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 SystemTrayItem::SystemTrayItem() {
 }
 
 SystemTrayItem::~SystemTrayItem() {
 }
 
 views::View* SystemTrayItem::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
-views::View* SystemTrayItem::CreateDefaultView(user::LoginStatus status) {
+views::View* SystemTrayItem::CreateDefaultView(user::LoginStatus status,
+                                               int bubble_width) {
   return NULL;
 }
 
 views::View* SystemTrayItem::CreateDetailedView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* SystemTrayItem::CreateNotificationView(user::LoginStatus status) {
   return NULL;
 }
@@ skipping 39 matching lines @@
 }
 
 void SystemTrayItem::HideNotificationView() {
   Shell::GetInstance()->system_tray()->HideNotificationView(this);
 }
 
 bool SystemTrayItem::ShouldShowLauncher() const {
   return true;
 }
 
+bool SystemTrayItem::GuaranteeDefaultViewPreferredSize(
+    user::LoginStatus status) const {
+  return false;
+}
+
 }  // namespace ash