cros: Remove some OS platform ifdefs from ash

ash/system/web_notification/web_notification_tray_unittest.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/common/system/web_notification/web_notification_tray.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/web_notification/ash_popup_alignment_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
+#include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/test/ash_md_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/message_center_bubble.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/screen_layout_observer.h"
-#endif
-
 namespace ash {
 
 namespace {
 
 WebNotificationTray* GetTray() {
   return StatusAreaWidgetTestHelper::GetStatusAreaWidget()
       ->web_notification_tray();
 }
 
-#if defined(OS_CHROMEOS)
-
 WebNotificationTray* GetSecondaryTray() {
   StatusAreaWidget* status_area_widget =
       StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget();
   if (status_area_widget)
     return status_area_widget->web_notification_tray();
   return NULL;
 }
 
-#endif
-
 message_center::MessageCenter* GetMessageCenter() {
   return GetTray()->message_center();
 }
 
 SystemTray* GetSystemTray() {
   return StatusAreaWidgetTestHelper::GetStatusAreaWidget()->system_tray();
 }
 
 // Trivial item implementation for testing PopupAndSystemTray test case.
 class TestItem : public SystemTrayItem {
@@ skipping 184 matching lines @@
     AddNotification(id);
   }
   GetTray()->ShowPopups();
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   EXPECT_EQ(notifications_to_add, GetMessageCenter()->NotificationCount());
   NotificationList::PopupNotifications popups =
       GetMessageCenter()->GetPopupNotifications();
   EXPECT_EQ(message_center::kMaxVisiblePopupNotifications, popups.size());
 }
 
-// Display notification is ChromeOS only.
-#if defined(OS_CHROMEOS)
-
 // Verifies if the notification appears on both displays when extended mode.
 TEST_P(WebNotificationTrayTest, PopupShownOnBothDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   Shell::GetInstance()
       ->screen_layout_observer()
       ->set_show_notifications_for_testing(true);
   UpdateDisplay("400x400,200x200");
   // UpdateDisplay() creates the display notifications, so popup is visible.
@@ skipping 13 matching lines @@
   EXPECT_FALSE(GetSecondaryTray());
 
   display_manager()->SetMultiDisplayMode(display::DisplayManager::EXTENDED);
   UpdateDisplay("400x400,200x200");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   secondary_tray = GetSecondaryTray();
   ASSERT_TRUE(secondary_tray);
   EXPECT_TRUE(secondary_tray->IsPopupVisible());
 }
 
-#endif  // defined(OS_CHROMEOS)
-
 // PopupAndSystemTray may fail in platforms other than ChromeOS because the
 // RootWindow's bound can be bigger than display::Display's work area so that
 // openingsystem tray doesn't affect at all the work area of popups.
-#if defined(OS_CHROMEOS)
-
 TEST_P(WebNotificationTrayTest, PopupAndSystemTray) {
   TestItem* test_item = new TestItem;
   GetSystemTray()->AddTrayItem(test_item);
 
   AddNotification("test_id");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   int bottom = GetPopupWorkAreaBottom();
 
   // System tray is created, the popup's work area should be narrowed but still
   // visible.
@@ skipping 119 matching lines @@
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   EXPECT_EQ(bottom, GetPopupWorkAreaBottom());
 
   generator.MoveMouseTo(
       display::Screen::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint());
   shelf->UpdateVisibilityState();
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   EXPECT_EQ(bottom_auto_hidden, GetPopupWorkAreaBottom());
 }
 
-#endif  // defined(OS_CHROMEOS)
-
-// Display notification is ChromeOS only.
-#if defined(OS_CHROMEOS)
-
 TEST_P(WebNotificationTrayTest, PopupAndSystemTrayMultiDisplay) {
   UpdateDisplay("800x600,600x400");
 
   AddNotification("test_id");
   int bottom = GetPopupWorkAreaBottom();
   int bottom_second = GetPopupWorkAreaBottomForTray(GetSecondaryTray());
 
   // System tray is created on the primary display. The popups in the secondary
   // tray aren't affected.
   GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_GT(bottom, GetPopupWorkAreaBottom());
   EXPECT_EQ(bottom_second, GetPopupWorkAreaBottomForTray(GetSecondaryTray()));
 }
 
-#endif  // defined(OS_CHROMEOS)
-
-#if defined(OS_CHROMEOS)
-
 // Tests that there is visual feedback for touch presses.
 TEST_P(WebNotificationTrayTest, TouchFeedback) {
   // Touch feedback is not available in material mode.
   if (MaterialDesignController::IsShelfMaterial())
     return;
 
   AddNotification("test_id");
   RunAllPendingInMessageLoop();
   WebNotificationTray* tray = GetTray();
   EXPECT_TRUE(tray->visible());
@@ skipping 36 matching lines @@
 
   gfx::Point out_of_bounds(bounds.x() - 1, center_point.y());
   generator.MoveTouch(out_of_bounds);
   EXPECT_FALSE(tray->is_active());
 
   generator.ReleaseTouch();
   EXPECT_FALSE(tray->is_active());
   EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
 }
 
-#endif  // OS_CHROMEOS
-
 }  // namespace ash