diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 14:48:10 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 14:48:10 +0000 |
| commit | bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41 (patch) | |
| tree | 8d170862fabd03b266f6960f1dd615a987872a62 /content/public/test/test_renderer_host.h | |
| parent | b596068321d72606cd8e65204380e2b23b9169cc (diff) | |
| download | chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.zip chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.tar.gz chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.tar.bz2 | |
Move wm/public into wm target
TBR=sky@chromium.org
http://crbug/com/308710
Review URL: https://codereview.chromium.org/209383003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/test/test_renderer_host.h')
| -rw-r--r-- | content/public/test/test_renderer_host.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h index 5a285ca..700d1f0 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_; |