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

Unified Diff: chrome/test/base/browser_with_test_window_test.cc

Issue 209383003: Move wm/public into wm target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.h ('k') | chrome/test/base/view_event_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/browser_with_test_window_test.cc
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 47d682b1c61776ee143c52191daab8c5fd8b0d49..e97200a8129d1fcbaffc5520235b66f780e073b1 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -18,8 +18,8 @@
#include "content/public/test/test_renderer_host.h"
#if defined(USE_AURA)
-#include "ui/aura/test/aura_test_helper.h"
#include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/wm/test/wm_test_helper.h"
#endif
#if defined(USE_ASH)
@@ -57,7 +57,7 @@ void BrowserWithTestWindowTest::SetUp() {
testing::Test::SetUp();
#if defined(OS_CHROMEOS)
// TODO(jamescook): Windows Ash support. This will require refactoring
- // AshTestHelper and AuraTestHelper so they can be used at the same time,
+ // AshTestHelper and WMTestHelper so they can be used at the same time,
// perhaps by AshTestHelper owning an AuraTestHelper.
ash_test_helper_.reset(new ash::test::AshTestHelper(
base::MessageLoopForUI::current()));
@@ -67,9 +67,8 @@ void BrowserWithTestWindowTest::SetUp() {
bool enable_pixel_output = false;
ui::InitializeContextFactoryForTests(enable_pixel_output);
- aura_test_helper_.reset(new aura::test::AuraTestHelper(
- base::MessageLoopForUI::current()));
- aura_test_helper_->SetUp();
+ wm_test_helper_.reset(new wm::WMTestHelper);
+ wm_test_helper_->SetUp();
#endif // USE_AURA
#if defined(TOOLKIT_VIEWS)
views_delegate_.reset(CreateViewsDelegate());
@@ -99,7 +98,7 @@ void BrowserWithTestWindowTest::TearDown() {
#if defined(OS_CHROMEOS)
ash_test_helper_->TearDown();
#elif defined(USE_AURA)
- aura_test_helper_->TearDown();
+ wm_test_helper_->TearDown();
ui::TerminateContextFactoryForTests();
#endif
testing::Test::TearDown();
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.h ('k') | chrome/test/base/view_event_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698