diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:28:45 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:28:45 +0000 |
| commit | 14be8a2901fd1ef01b2d886fdc67b46dfad95a8f (patch) | |
| tree | 8d170862fabd03b266f6960f1dd615a987872a62 /ui | |
| parent | 1a1f77618aae7e5bcf02a25f9d18e3d0cb6a212b (diff) | |
| download | chromium_src-14be8a2901fd1ef01b2d886fdc67b46dfad95a8f.zip chromium_src-14be8a2901fd1ef01b2d886fdc67b46dfad95a8f.tar.gz chromium_src-14be8a2901fd1ef01b2d886fdc67b46dfad95a8f.tar.bz2 | |
Revert 259581 "Fix bustage with nested namespace"
> Fix bustage with nested namespace
>
> BUG=
>
> Review URL: https://codereview.chromium.org/212863006
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/212893004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 0954665..55c90c8 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -90,7 +90,7 @@ class SnapshotAuraTest : public testing::Test { bool enable_pixel_output = true; ui::InitializeContextFactoryForTests(enable_pixel_output); - helper_.reset(new ::wm::WMTestHelper); + helper_.reset(new wm::WMTestHelper); helper_->SetUp(); } @@ -171,7 +171,7 @@ class SnapshotAuraTest : public testing::Test { bool completed_; }; - scoped_ptr<::wm::WMTestHelper> helper_; + scoped_ptr<wm::WMTestHelper> helper_; scoped_ptr<aura::Window> test_window_; scoped_ptr<TestPaintingWindowDelegate> delegate_; std::vector<unsigned char> png_representation_; |