Index: chrome/browser/prerender/prerender_browsertest.cc |
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc |
index e44aca55911138d363cd4fdffcb8949514ba6693..a05d1e8d6df832a3e2c050c25a5a984b213b4550 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 { |
+ if (UsingAcceleratedVideoDecode()) { |
+ // The GPU Video Decoder needs real GL bindings. |
+ UseRealGLBindings(); |
+ } |
+ InProcessBrowserTest::SetUp(); |
+ } |
+ |
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
#if defined(FULL_SAFE_BROWSING) |
SafeBrowsingService::RegisterFactory(safe_browsing_factory_.get()); |
@@ -2742,6 +2750,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); |