Remove the system menu display settings row

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/rotation/tray_rotation_lock.h"
-#include "ash/system/chromeos/tray_display.h"
+#include "ash/system/chromeos/screen_layout_observer.h"

[James Cook, 2016/08/15 21:42:15]

unused?

[yiyix, 2016/08/16 15:58:37]

Done.

 #include "base/memory/ptr_util.h"
 #else
 #include "ash/common/system/tray/system_tray_item.h"
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
@@ skipping 84 matching lines @@
     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();
 }
 
-std::unique_ptr<SystemTrayItem> TestSystemTrayDelegate::CreateDisplayTrayItem(
-    SystemTray* tray) {
-#if defined(OS_CHROMEOS)
-  return base::MakeUnique<TrayDisplay>(tray);
-#else
-  return nullptr;
-#endif
-}
-
 std::unique_ptr<SystemTrayItem>
 TestSystemTrayDelegate::CreateRotationLockTrayItem(SystemTray* tray) {
 #if defined(OS_CHROMEOS)
   return base::MakeUnique<TrayRotationLock>(tray);
 #else
   return nullptr;
 #endif
 }
 
 void TestSystemTrayDelegate::GetCurrentIME(IMEInfo* info) {
   *info = current_ime_;
 }
 
 }  // namespace test
 }  // namespace ash