ash uber tray: Fix a couple of crashes when quitting.

BUG=110130
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9583001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124669 0039d316-1c4b-4281-b951-d872f2087c98

ash/system/tray/system_tray.cc

@@ -81,6 +81,8 @@ SystemTray::SystemTray()
 }
 
 SystemTray::~SystemTray() {
+  if (popup_)
+    popup_->CloseNow();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
       it != items_.end();
       ++it) {

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -32,7 +32,9 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
   }
 
   virtual ~SystemTrayDelegate() {
-    AudioHandler::GetInstance()->RemoveVolumeObserver(this);
+    AudioHandler* audiohandler = AudioHandler::GetInstance();
+    if (audiohandler)
+      audiohandler->RemoveVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   }