From ff4d672e9e3aa4ebe831eb52f05b10f5ab145699 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Sun, 24 Nov 2013 20:18:25 +0000 Subject: Destroy ResourceBundle instance when ViewTestSuite is shutdown. I missed this when I added the call to InitSharedInstanceWithPakPath() in r234537, crrev.com/234537 BUG=144345 TEST=views_unittests R=tony@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/83733007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237006 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/run_all_unittests.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ui') diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index 8cf0a25..499d339 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -10,7 +10,6 @@ #include "base/test/test_suite.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "ui/views/view.h" class ViewTestSuite : public base::TestSuite { public: @@ -30,6 +29,11 @@ class ViewTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); } + virtual void Shutdown() OVERRIDE { + ui::ResourceBundle::CleanupSharedInstance(); + base::TestSuite::Shutdown(); + } + private: DISALLOW_COPY_AND_ASSIGN(ViewTestSuite); }; -- cgit v1.1