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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 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: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 7405e51f48d2729ccbcfe1afcbb6e0082a3ff371..de14f6de264b96883ff72ff176a02c6efff532ad 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -645,6 +645,14 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
return web_contents->GetController().GetDefaultSessionStorageNamespace();
}
+ virtual void SetUp() OVERRIDE {
+ // TODO(danakj): The GPU Video Decoder needs real GL bindings.
+ // crbug.com/269087
+ UseRealGLBindings();
+
+ InProcessBrowserTest::SetUp();
+ }
+
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
#if defined(FULL_SAFE_BROWSING)
SafeBrowsingService::RegisterFactory(safe_browsing_factory_.get());
@@ -2743,6 +2751,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,
public ExtensionApiTest {
public:
+ virtual void SetUp() OVERRIDE {
+ PrerenderBrowserTest::SetUp();
+ }
+
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
PrerenderBrowserTest::SetUpCommandLine(command_line);
ExtensionApiTest::SetUpCommandLine(command_line);

Powered by Google App Engine
This is Rietveld 408576698