Clean up some ifdefs around Win Aura.

chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.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/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 699 matching lines @@
   }
 
   void Step6() {
     ASSERT_TRUE(model_->other_node()->GetChild(0)->url() == url_dragging_);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-#if !(defined(OS_WIN) && defined(USE_AURA))
+#if !defined(OS_WIN)
 // This test passes locally (on aero and non-aero) but fails on the trybots and
 // buildbot.
 // http://crbug.com/154081
 VIEW_TEST(BookmarkBarViewTest7, MAYBE(DNDToDifferentMenu))
 #endif
 
 // Drags from one menu to next so that original menu closes, then back to
 // original menu.
 class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
  protected:
@@ skipping 88 matching lines @@
     // Make sure drop was processed.
     GURL final_url = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->
         GetChild(1)->url();
     ASSERT_TRUE(final_url == url_dragging_);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-#if !(defined(OS_WIN) && defined(USE_AURA))
+#if !defined(OS_WIN)
 // This test passes locally (on aero and non-aero) but fails on the trybots and
 // buildbot.
 // http://crbug.com/154081
 VIEW_TEST(BookmarkBarViewTest8, MAYBE(DNDBackToOriginatingMenu))
 #endif
 
 // Moves the mouse over the scroll button and makes sure we get scrolling.
 class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase {
  protected:
   virtual bool CreateBigMenu() OVERRIDE { return true; }
@@ skipping 980 matching lines @@
     EXPECT_TRUE(bb_view_->GetContextMenu() == NULL);
     EXPECT_TRUE(bb_view_->GetMenu() == NULL);
 
     Done();
   }
 
   ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest21, ContextMenusForEmptyFolder)