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

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

Issue 22648006: Revert 216780 "Clean up compositor initialization/destruction." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/chrome/browser/prerender/prerender_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/prerender/prerender_browsertest.cc (revision 216906)
+++ trunk/src/chrome/browser/prerender/prerender_browsertest.cc (working copy)
@@ -645,14 +645,6 @@
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());
@@ -2750,10 +2742,6 @@
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);
« no previous file with comments | « trunk/src/chrome/browser/extensions/web_view_browsertest.cc ('k') | trunk/src/chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698