ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/host/ash_window_tree_host_x11_unittest.cc

 // Copyright 2014 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/host/ash_window_tree_host_x11.h"
 
 #undef None
 #undef Bool
 
 #include "base/sys_info.h"
@@ skipping 44 matching lines @@
 
 }  // namespace
 
 namespace ash {
 
 class AshWindowTreeHostX11Test : public aura::test::AuraTestBase {
  public:
   void SetUp() override {
     aura::test::AuraTestBase::SetUp();
 
-#if defined(OS_CHROMEOS)
     // Fake a ChromeOS running env.
     const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
     base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
-#endif
   }
 
   void TearDown() override {
     aura::test::AuraTestBase::TearDown();
 
-#if defined(OS_CHROMEOS)
     // Revert the CrOS testing env otherwise the following non-CrOS aura
     // tests will fail.
-    // Fake a ChromeOS running env.
     const char* kLsbRelease = "";
     base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
-#endif
   }
 };
 
-// Fails on ChromeOS valgrind bot. http://crbug.com/499997
-#if defined(OS_CHROMEOS)
-#define MAYBE_DispatchTouchEventToOneRootWindow \
-  DISABLED_DispatchTouchEventToOneRootWindow
-#else
-#define MAYBE_DispatchTouchEventToOneRootWindow \
-  DispatchTouchEventToOneRootWindow
-#endif
-
 // Send X touch events to one WindowTreeHost. The WindowTreeHost's
 // delegate will get corresponding ui::TouchEvent if the touch events
 // are targeting this WindowTreeHost.
-TEST_F(AshWindowTreeHostX11Test, MAYBE_DispatchTouchEventToOneRootWindow) {
+// Fails on ChromeOS valgrind bot. http://crbug.com/499997
+TEST_F(AshWindowTreeHostX11Test, DISABLED_DispatchTouchEventToOneRootWindow) {
   std::unique_ptr<aura::WindowTreeHostX11> window_tree_host(
       new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
   window_tree_host->InitHost();
   window_tree_host->window()->Show();
   std::unique_ptr<RootWindowEventHandler> handler(
       new RootWindowEventHandler(window_tree_host.get()));
 
   std::vector<int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
@@ skipping 147 matching lines @@
   EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, handler2->last_touch_type());
   EXPECT_EQ(1, handler2->last_touch_id());
   EXPECT_EQ(gfx::Point(1600, 2650), handler2->last_touch_location());
 
   handler1.reset();
   handler2.reset();
 }
 
 }  // namespace aura