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

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

Issue 12494028: Move Requirements out of Extension Class (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 9 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 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();
}
};

Powered by Google App Engine
This is Rietveld 408576698