diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:33:35 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:33:35 +0000 |
| commit | 4cc33f40fde0c1c537863321fa6fde6aa2629843 (patch) | |
| tree | 49a4c1e4b9b8139634530af085e544e1d003ebe5 /ui/snapshot | |
| parent | 14be8a2901fd1ef01b2d886fdc67b46dfad95a8f (diff) | |
| download | chromium_src-4cc33f40fde0c1c537863321fa6fde6aa2629843.zip chromium_src-4cc33f40fde0c1c537863321fa6fde6aa2629843.tar.gz chromium_src-4cc33f40fde0c1c537863321fa6fde6aa2629843.tar.bz2 | |
Revert 259580 "Move wm/public into wm target"
> Move wm/public into wm target
>
> TBR=sky@chromium.org
> http://crbug/com/308710
>
> Review URL: https://codereview.chromium.org/209383003
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/213033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/DEPS | 1 | ||||
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/snapshot/DEPS b/ui/snapshot/DEPS index f6768d1..08ad30c 100644 --- a/ui/snapshot/DEPS +++ b/ui/snapshot/DEPS @@ -8,5 +8,4 @@ include_rules = [ "+ui/compositor", "+ui/gfx", "+ui/gl", - "+ui/wm", ] diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 55c90c8..b000ad1 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/test/test_simple_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/aura/test/aura_test_helper.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" @@ -22,7 +23,6 @@ #include "ui/gfx/size_conversions.h" #include "ui/gfx/transform.h" #include "ui/gl/gl_implementation.h" -#include "ui/wm/test/wm_test_helper.h" namespace ui { namespace { @@ -90,7 +90,8 @@ class SnapshotAuraTest : public testing::Test { bool enable_pixel_output = true; ui::InitializeContextFactoryForTests(enable_pixel_output); - helper_.reset(new wm::WMTestHelper); + helper_.reset( + new aura::test::AuraTestHelper(base::MessageLoopForUI::current())); helper_->SetUp(); } @@ -171,7 +172,7 @@ class SnapshotAuraTest : public testing::Test { bool completed_; }; - scoped_ptr<wm::WMTestHelper> helper_; + scoped_ptr<aura::test::AuraTestHelper> helper_; scoped_ptr<aura::Window> test_window_; scoped_ptr<TestPaintingWindowDelegate> delegate_; std::vector<unsigned char> png_representation_; |