| 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);
|
|
|