mash: Create system tray display and rotation lock items via delegate

ash/test/test_system_tray_delegate.cc

Index: ash/test/test_system_tray_delegate.cc
diff --git a/ash/test/test_system_tray_delegate.cc b/ash/test/test_system_tray_delegate.cc
index 6074b3928af2b501f544cea6b82e1ea66bc70655..5df377cf81796370a452bb551d6cc093003b8886 100644
--- a/ash/test/test_system_tray_delegate.cc
+++ b/ash/test/test_system_tray_delegate.cc
@@ -13,6 +13,11 @@
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/tray_display.h"
+#include "base/memory/ptr_util.h"
+#endif
+
 namespace ash {
 namespace test {
 
@@ -84,6 +89,15 @@ void TestSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
   info->factory_reset_required = false;
 }
 
+std::unique_ptr<ash::SystemTrayItem>
+TestSystemTrayDelegate::CreateDisplayTrayItem(SystemTray* tray) {
+#if defined(OS_CHROMEOS)
+  return base::WrapUnique(new TrayDisplay(tray));

[msw, 2016/07/13 18:51:49]

nit: MakeUnique

[James Cook, 2016/07/13 21:30:46]

Done.

+#else
+  return nullptr;
+#endif
+}
+
 bool TestSystemTrayDelegate::ShouldShowDisplayNotification() {
   return should_show_display_notification_;
 }