chromeos: Remove OS ifdefs from ash/common/system/tray

ash/common/system/tray/system_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/tray/system_tray.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/accelerators/accelerator_controller.h"
@@ skipping 17 matching lines @@
 #include "base/test/histogram_tester.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 namespace ash {
 namespace test {
 
 namespace {
 
 const char kVisibleRowsHistogramName[] =
     "Ash.SystemMenu.DefaultView.VisibleRows";
 
 class ModalWidgetDelegate : public views::WidgetDelegateView {
  public:
@@ skipping 62 matching lines @@
 
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   histogram_tester.ExpectBucketCount(kVisibleRowsHistogramName,
                                      SystemTrayItem::UMA_NOT_RECORDED, 0);
 
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
 }
 
-// TODO(bruthig): Re-enable.  See https://crbug.com/665960.
-#if defined(OS_WIN)
-#define MAYBE_NullDefaultViewIsNotRecorded DISABLED_NullDefaultViewIsNotRecorded
-#else
-#define MAYBE_NullDefaultViewIsNotRecorded NullDefaultViewIsNotRecorded
-#endif
 // Verifies null default views are not recorded in the
 // "Ash.SystemMenu.DefaultView.VisibleItems" histogram.
-TEST_F(SystemTrayTest, MAYBE_NullDefaultViewIsNotRecorded) {
+TEST_F(SystemTrayTest, NullDefaultViewIsNotRecorded) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestSystemTrayItem* test_item = new TestSystemTrayItem();
   test_item->set_has_views(false);
   tray->AddTrayItem(test_item);
 
   base::HistogramTester histogram_tester;
 
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
@@ skipping 241 matching lines @@
   ASSERT_TRUE(detailed_item->detailed_view() != NULL);
   ASSERT_TRUE(test_item->notification_view() != NULL);
 
   // Hide the detailed view, ensure the notification view still exists.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
   ASSERT_TRUE(detailed_item->detailed_view() == NULL);
   ASSERT_TRUE(test_item->notification_view() != NULL);
 }
 
-// Test is flaky on Win7 and Cros (crbug.com/637978).
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
-#define MAYBE_BubbleCreationTypesTest DISABLED_BubbleCreationTypesTest
-#else
-#define MAYBE_BubbleCreationTypesTest BubbleCreationTypesTest
-#endif
-TEST_F(SystemTrayTest, MAYBE_BubbleCreationTypesTest) {
+// Test is flaky. http://crbug.com/637978
+TEST_F(SystemTrayTest, DISABLED_BubbleCreationTypesTest) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestSystemTrayItem* test_item = new TestSystemTrayItem();
   tray->AddTrayItem(test_item);
 
   // Ensure the tray views are created.
   ASSERT_TRUE(test_item->tray_view() != NULL);
 
   // Show the default view, ensure the notification view is destroyed.
@@ skipping 105 matching lines @@
   widget->Activate();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(tray->HasSystemBubble());
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(gfx::Point(5, 5));
   generator.ClickLeftButton();
   EXPECT_TRUE(tray->HasSystemBubble());
 }
 
-#if defined(OS_CHROMEOS)
-// Accessibility/Settings tray items are available only on cros.
-#define MAYBE_WithSystemModal WithSystemModal
-#else
-#define MAYBE_WithSystemModal DISABLED_WithSystemModal
-#endif
-TEST_F(SystemTrayTest, MAYBE_WithSystemModal) {
+TEST_F(SystemTrayTest, WithSystemModal) {
   // Check if the accessibility item is created even with system modal dialog.
   WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(true);
   std::unique_ptr<views::Widget> widget(CreateTestWidget(
       new ModalWidgetDelegate, kShellWindowId_SystemModalContainer,
       gfx::Rect(0, 0, 100, 100)));
 
   SystemTray* tray = GetPrimarySystemTray();
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
 
   ASSERT_TRUE(tray->HasSystemBubble());
@@ skipping 39 matching lines @@
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(0.0f, tray->layer()->GetTargetOpacity());
 
   tray->SetVisible(true);
   animation_duration.reset();
   tray->layer()->GetAnimator()->StopAnimating();
   EXPECT_TRUE(tray->visible());
   EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
 }
 
-#if defined(OS_CHROMEOS)
 // Tests that touch on an item in the system bubble triggers it to become
 // active.
 TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedback) {
   // Material design will use the ink drop ripple framework to show
   // active states.
   if (MaterialDesignController::IsSystemTrayMenuMaterial())
     return;
 
   SystemTray* tray = GetPrimarySystemTray();
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
@@ skipping 54 matching lines @@
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   EXPECT_LT(0, notification_tray->tray_bubble_height_for_test());
 
   // Hide the default view, ensure the tray bubble height is back to zero.
   ASSERT_TRUE(tray->CloseSystemBubble());
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
 }
-#endif  // OS_CHROMEOS
 
 }  // namespace test
 }  // namespace ash