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

Unified Diff: chrome/test/base/in_process_browser_test.h

Issue 16022003: Base for Ash browser_tests on Win8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Do not use SetUp/TearDownTestCase() Created 7 years, 6 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
« no previous file with comments | « chrome/test/DEPS ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..440acfecda5d88e2e800a585398d6fa1780746ce 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;
@@ -209,6 +215,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)
+ scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+#endif
};
#endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
« no previous file with comments | « chrome/test/DEPS ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698