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

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

Issue 120313002: Use stub GL draw/clear calls for browser tests that do not need pixels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stubgl: use_osmesa 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
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | content/browser/media/media_browsertest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
index 1a73e55e5a562c1fc7ffb4479ec7418b2e07bf20..33881d1446150e9363b352b998f1bb33dca87989 100644
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -225,11 +225,6 @@ class BrowserPluginHostTest : public ContentBrowserTest {
TestBrowserPluginHostFactory::GetInstance());
content::BrowserPluginGuestManager::set_factory_for_testing(
TestBrowserPluginHostFactory::GetInstance());
-
- // 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 {
@@ -818,7 +813,19 @@ class BrowserPluginThreadedCompositorTest : public BrowserPluginHostTest {
virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE {
BrowserPluginHostTest::SetUpCommandLine(cmd);
cmd->AppendSwitch(switches::kEnableThreadedCompositing);
+ }
+};
+class BrowserPluginThreadedCompositorPixelTest
+ : public BrowserPluginThreadedCompositorTest {
+ protected:
+ virtual void SetUp() OVERRIDE {
+ UseRealGLContexts();
+ BrowserPluginThreadedCompositorTest::SetUp();
+ }
+
+ virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE {
+ BrowserPluginThreadedCompositorTest::SetUpCommandLine(cmd);
// http://crbug.com/327035
cmd->AppendSwitch(switches::kDisableDelegatedRenderer);
}
@@ -894,7 +901,7 @@ static void CompareSkBitmapAndRun(const base::Closure& callback,
#else
#define MAYBE_GetBackingStore GetBackingStore
#endif
-IN_PROC_BROWSER_TEST_F(BrowserPluginThreadedCompositorTest,
+IN_PROC_BROWSER_TEST_F(BrowserPluginThreadedCompositorPixelTest,
MAYBE_GetBackingStore) {
const char kEmbedderURL[] = "/browser_plugin_embedder.html";
const char kHTMLForGuest[] =
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | content/browser/media/media_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698