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

Unified Diff: content/public/test/test_renderer_host.h

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 | « content/content_tests.gypi ('k') | content/public/test/test_renderer_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/test_renderer_host.h
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index 5a285cacbf03d5b14c9dabe1facf5fef4f819ff6..700d1f05d4562f1d638338beff82bd256daf66fd 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -14,15 +14,9 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(USE_AURA)
-#include "ui/aura/test/aura_test_helper.h"
+#include "ui/wm/test/wm_test_helper.h"
#endif
-namespace aura {
-namespace test {
-class AuraTestHelper;
-}
-}
-
namespace ui {
class ScopedOleInitializer;
}
@@ -177,7 +171,7 @@ class RenderViewHostTestHarness : public testing::Test {
TestBrowserThreadBundle* thread_bundle() { return thread_bundle_.get(); }
#if defined(USE_AURA)
- aura::Window* root_window() { return aura_test_helper_->root_window(); }
+ aura::Window* root_window() { return wm_test_helper_->root_window(); }
#endif
// Replaces the RPH being used.
@@ -194,7 +188,7 @@ class RenderViewHostTestHarness : public testing::Test {
scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
#endif
#if defined(USE_AURA)
- scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
+ scoped_ptr<wm::WMTestHelper> wm_test_helper_;
#endif
RenderViewHostTestEnabler rvh_test_enabler_;
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/test_renderer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698