mash: Minor ash/common fixes for tray_display.

ash/system/chromeos/tray_display_unittest.cc

 // Copyright 2013 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/chromeos/tray_display.h"
 
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "ash/display/display_manager.h"
-#include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
@@ skipping 99 matching lines @@
   CheckUpdate();
   return tray_;
 }
 
 TrayDisplay* TrayDisplayTest::GetTrayDisplay() {
   CheckUpdate();
   return tray_display_;
 }
 
 void TrayDisplayTest::CheckUpdate() {
-  SystemTray* current =
-      Shell::GetPrimaryRootWindowController()->GetSystemTray();
+  SystemTray* current = GetPrimarySystemTray();
   if (tray_ != current) {
     tray_ = current;
     tray_display_ = new TrayDisplay(tray_);
     tray_->AddTrayItem(tray_display_);
   }
 }
 
 void TrayDisplayTest::CloseNotification() {
   message_center::MessageCenter::Get()->RemoveNotification(
       TrayDisplay::kNotificationId, false);
@@ skipping 469 matching lines @@
       display::Display::ROTATION_SOURCE_ACCELEROMETER);
   EXPECT_FALSE(IsDisplayVisibleInTray());
 
   // If a non-rotation setting is changed, display regardless of the source of
   // rotation so that the full message is shown.
   UpdateDisplay("400x400@1.5");
   EXPECT_TRUE(IsDisplayVisibleInTray());
 }
 
 }  // namespace ash