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

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

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: Fix dominance 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 e44aca55911138d363cd4fdffcb8949514ba6693..46190e9371ab25a54f0ed9055754bb80fb7ee634 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -645,6 +645,13 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
return web_contents->GetController().GetDefaultSessionStorageNamespace();
}
+ virtual void SetUp() OVERRIDE {
+ // 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 +2749,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,
public ExtensionApiTest {
public:
+ virtual void SetUp() OVERRIDE {
+ PrerenderBrowserTest::SetUp();
+ ExtensionApiTest::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