Aura: Build on the linux desktop, plus add USE_ASH.

chrome/test/base/test_launcher_utils.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 "chrome/test/base/test_launcher_utils.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/gfx/gl/gl_switches.h"
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #endif
 
 namespace test_launcher_utils {
 
 void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
   // Turn off tip loading for tests; see http://crbug.com/17725.
   command_line->AppendSwitch(switches::kDisableWebResources);
 
   // Turn off preconnects because they break the brittle python webserver;
@@ skipping 17 matching lines @@
   // Don't install default apps.
   command_line->AppendSwitch(switches::kDisableDefaultApps);
 
   // Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist
   // auto-update.
   command_line->AppendSwitch(switches::kSkipGpuDataLoading);
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
-  // TODO(beng): USE_ASH.
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   // Disable window animations under aura as the animations effect the
   // coordinates returned and result in flake.
   command_line->AppendSwitch(ash::switches::kAuraWindowAnimationsDisabled);
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   // Don't use the native password stores on Linux since they may
   // prompt for additional UI during tests and cause test failures or
   // timeouts.  Win, Mac and ChromeOS don't look at the kPasswordStore
   // switch.
@@ skipping 36 matching lines @@
                               const std::string& implementation_name) {
   if (command_line->HasSwitch(switches::kUseGL))
     return false;
 
   command_line->AppendSwitchASCII(switches::kUseGL, implementation_name);
 
   return true;
 }
 
 }  // namespace test_launcher_utils