Clean up some ifdefs around Win Aura.

chrome/browser/ui/find_bar/find_bar_host_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.
 
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 24 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
 #include "content/public/browser/web_contents_view.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
 using base::ASCIIToUTF16;
 using base::WideToUTF16;
 using content::NavigationController;
 using content::WebContents;
 
@@ skipping 229 matching lines @@
     ui_test_utils::NavigateToURL(browser(), urls[i]);
     EXPECT_EQ(1, FindInPageWchar(web_contents, L"cat",
                                  kFwd, kIgnoreCase, NULL));
     EXPECT_EQ(0, FindInPageWchar(web_contents, L"bat",
                                  kFwd, kIgnoreCase, NULL));
   }
 }
 
 // Verify search for text within special URLs such as chrome:history,
 // chrome://downloads, data directory
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
 // Disabled due to crbug.com/175711
 #define MAYBE_SearchWithinSpecialURL \
         DISABLED_SearchWithinSpecialURL
 #else
 #define MAYBE_SearchWithinSpecialURL \
         SearchWithinSpecialURL
 #endif
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_SearchWithinSpecialURL) {
   WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 1241 matching lines @@
   EXPECT_TRUE(chrome::ExecuteCommand(browser_incognito, IDC_FIND_NEXT));
   WebContents* web_contents_incognito =
       browser_incognito->tab_strip_model()->GetActiveWebContents();
   ui_test_utils::FindInPageNotificationObserver observer(
       web_contents_incognito);
   observer.Wait();
   EXPECT_EQ(ASCIIToUTF16("bar"),
             GetFindBarTextForBrowser(browser_incognito));
 }
 
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
 
 BOOL CALLBACK EnumerateChildren(HWND hwnd, LPARAM l_param) {
   HWND* child = reinterpret_cast<HWND*>(l_param);
   *child = hwnd;
   // The first child window is the plugin, then its children. So stop
   // enumerating after the first callback.
   return FALSE;
 }
 
 // Ensure that the find bar is always over a windowed NPAPI plugin.
@@ skipping 49 matching lines @@
   ASSERT_EQ(result, SIMPLEREGION);
   bool rects_equal =
       region_before.left == region_after.left &&
       region_before.top == region_after.top &&
       region_before.right == region_after.right &&
       region_before.bottom == region_after.bottom;
   ASSERT_FALSE(rects_equal);
 }
 
 #endif