summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 16:49:54 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 16:49:54 +0000
commitb436a69ffe55d22bdeddfb8b1229962a510203cc (patch)
treeedac230dfc9e12b5294d0439cbd4d0bb6b694116 /content/browser
parent4a80767ed12331099fe3b1b464875d318d1da895 (diff)
downloadchromium_src-b436a69ffe55d22bdeddfb8b1229962a510203cc.zip
chromium_src-b436a69ffe55d22bdeddfb8b1229962a510203cc.tar.gz
chromium_src-b436a69ffe55d22bdeddfb8b1229962a510203cc.tar.bz2
cros: More aura::Env::DeleteInstance(), to fix broken tests.
BUG=129075 TEST=none Review URL: https://chromiumcodereview.appspot.com/10448004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/renderer_host/render_widget_host_unittest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index b6b18c7..9ea7b11 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -25,6 +25,7 @@
#if defined(USE_AURA)
#include "content/browser/renderer_host/render_widget_host_view_aura.h"
+#include "ui/aura/env.h"
#endif
using base::TimeDelta;
@@ -310,6 +311,10 @@ class RenderWidgetHostTest : public testing::Test {
process_ = NULL;
browser_context_.reset();
+#if defined(USE_AURA)
+ aura::Env::DeleteInstance();
+#endif
+
// Process all pending tasks to avoid leaks.
MessageLoop::current()->RunAllPending();
}