Clean up some ifdefs around Win Aura.

chrome/test/base/chrome_test_launcher.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 "content/public/test/test_launcher.h"
 
 #include <stack>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 103 matching lines @@
     return new ChromeMainDelegate();
 #else
     // This delegate is only guaranteed to link on linux and windows, so just
     // bail out if we are on any other platform.
     NOTREACHED();
     return NULL;
 #endif
   }
 
   virtual void AdjustDefaultParallelJobs(int* default_jobs) OVERRIDE {
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kAshBrowserTests)) {
       *default_jobs = 1;
       fprintf(stdout,
               "Disabling test parallelization for --ash-browsertests.\n");
       fflush(stdout);
     }
-#endif  // defined(OS_WIN) && defined(USE_AURA)
+#endif  // defined(OS_WIN)
   }
 
  private:
 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
   std::stack<linked_ptr<views::AcceleratorHandler> > handlers_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate);
 };
 
 }  // namespace
 
 int LaunchChromeTests(int default_jobs, int argc, char** argv) {
 #if defined(OS_MACOSX)
   chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
   // We leak this pointer intentionally. The breakpad client needs to outlive
   // all other code.
   chrome::ChromeBreakpadClient* breakpad_client =
       new chrome::ChromeBreakpadClient();
   ANNOTATE_LEAKING_OBJECT_PTR(breakpad_client);
   breakpad::SetBreakpadClient(breakpad_client);
 #endif
 
   ChromeTestLauncherDelegate launcher_delegate;
   return content::LaunchTests(&launcher_delegate, default_jobs, argc, argv);
 }