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

Unified Diff: content/test/browser_test_base.cc

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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: content/test/browser_test_base.cc
===================================================================
--- content/test/browser_test_base.cc (revision 150588)
+++ content/test/browser_test_base.cc (working copy)
@@ -15,6 +15,10 @@
#include "base/system_monitor/system_monitor.h"
#endif
+#if defined(USE_AURA)
+#include "ui/aura/test/aura_test_helper.h"
+#endif
+
extern int BrowserMain(const content::MainFunctionParams&);
BrowserTestBase::BrowserTestBase() {
@@ -41,11 +45,18 @@
base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
SetUpInProcessBrowserTestFixture();
+#if defined(USE_AURA)
+ aura_test_helper_.reset(new aura::test::AuraTestHelper(&ui_loop_));
+ aura_test_helper_->SetUp();
+#endif // USE_AURA
BrowserMain(params);
TearDownInProcessBrowserTestFixture();
}
void BrowserTestBase::TearDown() {
+#if defined(USE_AURA)
+ aura_test_helper_->TearDown();
+#endif
}
void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {

Powered by Google App Engine
This is Rietveld 408576698