Shutdown the status tray before the system tray delegate.

ash/system/cast/tray_cast.cc

 // Copyright 2015 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/cast/tray_cast.h"
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
@@ skipping 24 matching lines @@
 
 namespace ash {
 
 namespace {
 
 const int kMaximumStatusStringLength = 100;
 const int kStopButtonRightPadding = 18;
 
 // Returns the active CastConfigDelegate instance.
 ash::CastConfigDelegate* GetCastConfigDelegate() {
-  // When shutting down Chrome, there may not be a shell or a delegate instance.
-  if (!ash::Shell::GetInstance() ||
-      !ash::Shell::GetInstance()->system_tray_delegate()) {
-    return nullptr;
-  }
-
   return ash::Shell::GetInstance()
       ->system_tray_delegate()
       ->GetCastConfigDelegate();
 }
 
 // Helper method to elide the given string to the maximum length. If a string is
 // contains user-input and is displayed, we should elide it.
 // TODO(jdufault): This does not properly trim unicode characters. We should
 // implement this properly by using views::Label::SetElideBehavior(...). See
 // crbug.com/532496.
@@ skipping 492 matching lines @@
   }
 }
 
 }  // namespace tray
 
 TrayCast::TrayCast(SystemTray* system_tray) : SystemTrayItem(system_tray) {
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 TrayCast::~TrayCast() {
-  // TODO(jdufault): Remove these if checks (and the ones in
-  // GetCastConfigDelegate) by fixing deinit order. See crbug.com/577413.
-  if (Shell::GetInstance())
-    Shell::GetInstance()->RemoveShellObserver(this);
-
-  ash::CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
-  if (added_observer_ && cast_config_delegate)
-    cast_config_delegate->RemoveObserver(this);
+  Shell::GetInstance()->RemoveShellObserver(this);
+  if (added_observer_)
+    GetCastConfigDelegate()->RemoveObserver(this);
 }
 
 void TrayCast::StartCastForTest(const std::string& receiver_id) {
   if (detailed_ != nullptr)
     detailed_->SimulateViewClickedForTest(receiver_id);
 }
 
 void TrayCast::StopCastForTest() {
   default_->cast_view()->StopCasting();
 }
@@ skipping 109 matching lines @@
   is_casting_ = started;
   UpdatePrimaryView();
 }
 
 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (tray_)
     tray_->UpdateAlignment(alignment);
 }
 
 }  // namespace ash