Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
===================================================================
--- content/browser/browser_plugin/browser_plugin_host_browsertest.cc (revision 244508)
+++ content/browser/browser_plugin/browser_plugin_host_browsertest.cc (working copy)
@@ -226,10 +226,6 @@
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();
@@ -579,9 +575,9 @@
}
}
-// 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

Powered by Google App Engine
This is Rietveld 408576698