| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index ece0d3807d2a24eff2ba178d1ae2ad345230b60e..9203dab080132150419dce891f00800e81f5107b 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -2678,6 +2678,7 @@ class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,
|
| }
|
| virtual ~PrerenderBrowserTestWithExtensions() {}
|
|
|
| + protected:
|
| virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| PrerenderBrowserTest::SetUpCommandLine(command_line);
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| @@ -2695,6 +2696,12 @@ class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,
|
|
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| PrerenderBrowserTest::SetUpOnMainThread();
|
| + ExtensionApiTest::SetUpOnMainThread();
|
| + }
|
| +
|
| + virtual void CleanUpOnMainThread() OVERRIDE {
|
| + PrerenderBrowserTest::CleanUpOnMainThread();
|
| + ExtensionApiTest::CleanUpOnMainThread();
|
| }
|
| };
|
|
|
|
|