summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-17 17:22:44 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-17 17:22:44 +0000
commit4bd9bcedc2c72e695a6f2a943e474483728bfd80 (patch)
treec65e3a1f22c29d9bb9b0dbc18fb870873b8ca7d9 /ui/aura
parentca4794b963d326a575b54961ea88e4fb53e2970e (diff)
downloadchromium_src-4bd9bcedc2c72e695a6f2a943e474483728bfd80.zip
chromium_src-4bd9bcedc2c72e695a6f2a943e474483728bfd80.tar.gz
chromium_src-4bd9bcedc2c72e695a6f2a943e474483728bfd80.tar.bz2
Fix aura_unittests build.
R=ben@chromium.org TEST=aura_unittests compiles and runs. Review URL: http://codereview.chromium.org/7931004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/window_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 532a44a..1025d44 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -78,9 +78,9 @@ class DestroyTrackingDelegateImpl : public WindowDelegateImpl {
}
private:
- bool in_destroying_;
int destroying_count_;
int destroyed_count_;
+ bool in_destroying_;
DISALLOW_COPY_AND_ASSIGN(DestroyTrackingDelegateImpl);
};
@@ -268,8 +268,7 @@ TEST_F(WindowTest, DestroyTest) {
{
scoped_ptr<Window> parent(
CreateTestWindowWithDelegate(&parent_delegate, 0, gfx::Rect(), NULL));
- Window* child = CreateTestWindowWithDelegate(&child_delegate, 0,
- gfx::Rect(), parent.get());
+ CreateTestWindowWithDelegate(&child_delegate, 0, gfx::Rect(), parent.get());
}
// Both the parent and child should have been destroyed.
EXPECT_EQ(1, parent_delegate.destroying_count());