Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/browser/ui/views/accelerator_table_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 <set>
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
@@ skipping 25 matching lines @@
            accelerator_list.begin(); it != accelerator_list.end(); ++it) {
     const AcceleratorMapping& entry = *it;
     EXPECT_TRUE(acclerators.insert(entry).second)
         << "Duplicated accelerator: " << entry.keycode << ", "
         << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
         << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
         << (entry.modifiers & ui::EF_ALT_DOWN);
   }
 }
 
-#if defined(OS_CHROMEOS)
+#if defined(USE_ASH) && !defined(OS_WIN)
 TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
   std::set<AcceleratorMapping, Cmp> acclerators;
   const std::vector<AcceleratorMapping> accelerator_list(GetAcceleratorList());
   for (std::vector<AcceleratorMapping>::const_iterator it =
            accelerator_list.begin(); it != accelerator_list.end(); ++it) {
     const AcceleratorMapping& entry = *it;
     acclerators.insert(entry);
   }
   for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) {
     const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i];
@@ skipping 10 matching lines @@
     EXPECT_TRUE(acclerators.insert(entry).second)
         << "Duplicated accelerator: " << entry.keycode << ", "
         << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
         << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
         << (entry.modifiers & ui::EF_ALT_DOWN);
   }
 }
 #endif  // USE_ASH
 
 }  // namespace chrome