Clean up some ifdefs around Win Aura.

chrome/browser/extensions/api/downloads/downloads_api_browsertest.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.
 
 // Disable everything on windows only. http://crbug.com/306144
 #ifndef OS_WIN
 
 #include <algorithm>
 
 #include "base/file_util.h"
@@ skipping 1510 matching lines @@
                          result_id,
                          GetFilename("slow.txt").c_str())));
   ASSERT_TRUE(WaitFor(api::OnChanged::kEventName,
       base::StringPrintf("[{\"id\":%d,"
                          "  \"state\": {"
                          "    \"current\": \"complete\","
                          "    \"previous\": \"in_progress\"}}]",
                          result_id)));
 }
 
-#if defined(OS_WIN) && defined(USE_AURA)
-// This test is very flaky on Win Aura. http://crbug.com/248438
+#if defined(OS_WIN)
+// This test is very flaky on Win. http://crbug.com/248438
 #define MAYBE_DownloadExtensionTest_Download_UnsafeHeaders \
     DISABLED_DownloadExtensionTest_Download_UnsafeHeaders
 #else
 #define MAYBE_DownloadExtensionTest_Download_UnsafeHeaders \
     DownloadExtensionTest_Download_UnsafeHeaders
 #endif
 
 // Test that we disallow certain headers case-insensitively.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        MAYBE_DownloadExtensionTest_Download_UnsafeHeaders) {
@@ skipping 228 matching lines @@
                          GetFilename("data.txt").c_str())));
   ASSERT_TRUE(WaitFor(api::OnChanged::kEventName,
       base::StringPrintf("[{\"id\": %d,"
                          "  \"state\": {"
                          "    \"previous\": \"in_progress\","
                          "    \"current\": \"complete\"}}]",
                          result_id)));
 }
 
 // Valid file URLs are valid URLs.
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
 // Disabled due to crbug.com/175711
 #define MAYBE_DownloadExtensionTest_Download_File \
         DISABLED_DownloadExtensionTest_Download_File
 #else
 #define MAYBE_DownloadExtensionTest_Download_File \
         DownloadExtensionTest_Download_File
 #endif
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        MAYBE_DownloadExtensionTest_Download_File) {
   GoOnTheRecord();
@@ skipping 1843 matching lines @@
   EXPECT_EQ("suggester", winner_id);
   EXPECT_EQ(FILE_PATH_LITERAL("b"), filename.value());
   EXPECT_EQ(api::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);
   EXPECT_FALSE(warnings.empty());
   EXPECT_EQ(extensions::ExtensionWarning::kDownloadFilenameConflict,
             warnings.begin()->warning_type());
   EXPECT_EQ("incumbent", warnings.begin()->extension_id());
 }
 
 #endif  // http://crbug.com/3061144