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

ash/test/test_system_tray_delegate.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/test/test_system_tray_delegate.h"
 
 #include <string>
 
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #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 {
 
 namespace {
 
 bool g_system_update_required = false;
 LoginStatus g_initial_status = LoginStatus::USER;
 
 }  // namespace
 
@@ skipping 51 matching lines @@
   return login_status_ == LoginStatus::SUPERVISED;
 }
 
 void TestSystemTrayDelegate::GetSystemUpdateInfo(UpdateInfo* info) const {
   DCHECK(info);
   info->severity = UpdateInfo::UPDATE_NORMAL;
   info->update_required = g_system_update_required;
   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_;
 }
 
 bool TestSystemTrayDelegate::GetSessionStartTime(
     base::TimeTicks* session_start_time) {
   // Just returns TimeTicks::Now(), so the remaining time is always the
   // specified limit. This is useful for testing.
   if (session_length_limit_set_)
     *session_start_time = base::TimeTicks::Now();
   return session_length_limit_set_;
 }
 
 bool TestSystemTrayDelegate::GetSessionLengthLimit(
     base::TimeDelta* session_length_limit) {
   if (session_length_limit_set_)
     *session_length_limit = session_length_limit_;
   return session_length_limit_set_;
 }
 
 void TestSystemTrayDelegate::SignOut() {
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 }  // namespace test
 }  // namespace ash