Clean up some ifdefs around Win Aura.

chrome/browser/ui/views/location_bar/star_view_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 "chrome/browser/ui/views/location_bar/star_view.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "ui/base/ui_base_switches.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
 
 namespace {
 
 typedef InProcessBrowserTest StarViewTest;
 
 // Verify that clicking the bookmark star a second time hides the bookmark
@@ skipping 27 matching lines @@
   star_view->OnMousePressed(pressed_event);
   // Hide the bubble manually. In the browser this would normally happen during
   // the event processing.
   BookmarkBubbleView::Hide();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(BookmarkBubbleView::IsShowing());
   star_view->OnMouseReleased(released_event);
   EXPECT_FALSE(BookmarkBubbleView::IsShowing());
 }
 
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
 
 class StarViewTestNoDWM : public InProcessBrowserTest {
  public:
   StarViewTestNoDWM() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kDisableDwmComposition);
   }
 };
 
@@ skipping 75 matching lines @@
       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
 
 }  // namespace