cros: Remove some OS platform ifdefs from ash

ash/test/test_shell_delegate.cc

 // Copyright (c) 2012 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_shell_delegate.h"
 
 #include <limits>
 
 #include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/gpu_support_stub.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_shelf_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/test/test_keyboard_ui.h"
 #include "ash/test/test_wallpaper_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/common/system/tray/system_tray_notifier.h"
-#endif
-
 namespace ash {
 namespace test {
 
 TestShellDelegate::TestShellDelegate()
     : num_exit_requests_(0),
       multi_profiles_enabled_(false),
       force_maximize_on_first_run_(false),
       touchscreen_enabled_in_local_pref_(true) {}
 
 TestShellDelegate::~TestShellDelegate() {}
@@ skipping 87 matching lines @@
 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
                                                      bool use_local_state) {
   if (use_local_state)
     touchscreen_enabled_in_local_pref_ = enabled;
 }
 
 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
 
 }  // namespace test
 }  // namespace ash