Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/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 38 matching lines @@
   int last_touch_id_;
   gfx::Point last_touch_location_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowEventHandler);
 };
 
 }  // namespace
 
 namespace ash {
 
-class AshWindowTreeHostX11Test : public aura::test::AuraTestBase {
- public:
-  virtual 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
-  }
-
-  virtual 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
-  }
-};
+typedef aura::test::AuraTestBase WindowTreeHostX11Test;
 
 // 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, DispatchTouchEventToOneRootWindow) {
+// are winthin the bound of the WindowTreeHost.
+TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) {
+  // Fake a ChromeOS running env.
+  const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
+  base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
+
   scoped_ptr<AshWindowTreeHostX11> window_tree_host(
       new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
   window_tree_host->InitHost();
   scoped_ptr<RootWindowEventHandler> handler(
       new RootWindowEventHandler(window_tree_host.get()));
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
@@ skipping 26 matching lines @@
   EXPECT_EQ(gfx::Point(1500, 1600), handler->last_touch_location());
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchEnd, 5, gfx::Point(1500, 1600), valuators);
   window_tree_host->DispatchEvent(scoped_xevent);
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, handler->last_touch_type());
   EXPECT_EQ(0, handler->last_touch_id());
   EXPECT_EQ(gfx::Point(1500, 1600), handler->last_touch_location());
 
   handler.reset();
+
+  // Revert the CrOS testing env otherwise the following non-CrOS aura
+  // tests will fail.
+  // Fake a ChromeOS running env.
+  kLsbRelease = "";
+  base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 }
 
 // Send X touch events to two WindowTreeHost. The WindowTreeHost which is
 // the event target of the X touch events should generate the corresponding
 // ui::TouchEvent for its delegate.
-TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
+TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
+  // Fake a ChromeOS running env.
+  const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
+  base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
+
   scoped_ptr<AshWindowTreeHostX11> window_tree_host1(
       new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
   window_tree_host1->InitHost();
   scoped_ptr<RootWindowEventHandler> handler1(
       new RootWindowEventHandler(window_tree_host1.get()));
 
   int host2_y_offset = 1700;
   scoped_ptr<AshWindowTreeHostX11> window_tree_host2(
       new AshWindowTreeHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080)));
   window_tree_host2->InitHost();
@@ skipping 78 matching lines @@
   EXPECT_EQ(ui::ET_UNKNOWN, handler1->last_touch_type());
   EXPECT_EQ(-1, handler1->last_touch_id());
   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 - host2_y_offset),
             handler2->last_touch_location());
 
   handler1.reset();
   handler2.reset();
+
+  // Revert the CrOS testing env otherwise the following non-CrOS aura
+  // tests will fail.
+  // Fake a ChromeOS running env.
+  kLsbRelease = "";
+  base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 }
 
 }  // namespace aura