Index: chrome/test/base/in_process_browser_test.h |
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h |
index db5977f9bed85b4d054e8d5138d92d098cc86ff9..bb838e72358d43612ed198488b5d33c1a9723ce5 100644 |
--- a/chrome/test/base/in_process_browser_test.h |
+++ b/chrome/test/base/in_process_browser_test.h |
@@ -18,13 +18,19 @@ |
#include "chrome/browser/chromeos/cros/cros_library.h" |
#endif // defined(OS_CHROMEOS) |
-#if defined(OS_MACOSX) |
namespace base { |
+#if defined(OS_MACOSX) |
namespace mac { |
class ScopedNSAutoreleasePool; |
} // namespace mac |
+#endif // defined(OS_MACOSX) |
+ |
+#if defined(OS_WIN) && defined(USE_AURA) |
+namespace win { |
+class ScopedCOMInitializer; |
+} |
+#endif // defined(OS_WIN) && defined(USE_AURA) |
} // namespace base |
-#endif // OS_MACOSX |
class Browser; |
class CommandLine; |
@@ -96,6 +102,13 @@ class InProcessBrowserTest : public content::BrowserTestBase { |
InProcessBrowserTest(); |
virtual ~InProcessBrowserTest(); |
+ // Sets up the stuff shared by all browser tests in this test case. |
+ static void SetUpTestCase(); |
+ |
+ // Restores state configured in SetUpTestCase after all browser tests in this |
+ // test case have ran. |
grt (UTC plus 2)
2013/06/20 23:10:06
nit: ran -> run
gab
2013/06/20 23:47:21
Arg, I keep making this grammatical mistake!
|
+ static void TearDownTestCase(); |
+ |
// Configures everything for an in process browser test, then invokes |
// BrowserMain. BrowserMain ends up invoking RunTestOnMainThreadLoop. |
virtual void SetUp() OVERRIDE; |
@@ -209,6 +222,10 @@ class InProcessBrowserTest : public content::BrowserTestBase { |
#if defined(OS_MACOSX) |
base::mac::ScopedNSAutoreleasePool* autorelease_pool_; |
#endif // OS_MACOSX |
+ |
+#if defined(OS_WIN) && defined(USE_AURA) |
+ static base::win::ScopedCOMInitializer* com_initializer_; |
+#endif |
}; |
#endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ |