Remove some code inside USE_AURA and OS_WIN ifdefs.

content/browser/browser_plugin/browser_plugin_host_browsertest.cc

 // Copyright 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/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 208 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     // Override factory to create tests instances of BrowserPlugin*.
     content::BrowserPluginEmbedder::set_factory_for_testing(
         TestBrowserPluginHostFactory::GetInstance());
     content::BrowserPluginGuest::set_factory_for_testing(
         TestBrowserPluginHostFactory::GetInstance());
     content::BrowserPluginGuestManager::set_factory_for_testing(
         TestBrowserPluginHostFactory::GetInstance());
 
-    // On legacy windows, the AcceptDragEvents test needs this to pass.
-#if defined(OS_WIN) && !defined(USE_AURA)
-    UseRealGLBindings();
-#endif
     // We need real contexts, otherwise the embedder doesn't composite, but the
     // guest does, and that isn't an expected configuration.
     UseRealGLContexts();
 
     ContentBrowserTest::SetUp();
   }
   virtual void TearDown() OVERRIDE {
     content::BrowserPluginEmbedder::set_factory_for_testing(NULL);
     content::BrowserPluginGuest::set_factory_for_testing(NULL);
 
@@ skipping 329 matching lines @@
     TestBrowserPluginGuest* new_test_guest =
         static_cast<TestBrowserPluginGuest*>(
           test_guest_web_contents->GetBrowserPluginGuest());
     ASSERT_TRUE(new_test_guest != NULL);
 
     // Wait for the guest to send an UpdateRectMsg, meaning it is ready.
     new_test_guest->WaitForUpdateRectMsg();
   }
 }
 
-// Always failing in the win7_aura try bot. See http://crbug.com/181107.
+// Always failing in the win7 try bot. See http://crbug.com/181107.
 // Times out on the Mac. See http://crbug.com/297576.
-#if (defined(OS_WIN) && defined(USE_AURA)) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_MACOSX)
 #define MAYBE_AcceptDragEvents DISABLED_AcceptDragEvents
 #else
 #define MAYBE_AcceptDragEvents AcceptDragEvents
 #endif
 
 // Tests that a drag-n-drop over the browser plugin in the embedder happens
 // correctly.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, MAYBE_AcceptDragEvents) {
   const char kEmbedderURL[] = "/browser_plugin_dragging.html";
   StartBrowserPluginTest(
@@ skipping 436 matching lines @@
     scoped_ptr<base::Value> value =
         content::ExecuteScriptAndGetValue(
             guest_rvh, "document.getElementById('input1').value");
     std::string actual_value;
     ASSERT_TRUE(value->GetAsString(&actual_value));
     EXPECT_EQ(base::UTF16ToUTF8(expected_value), actual_value);
   }
 }
 
 }  // namespace content