summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-24 20:18:25 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-24 20:18:25 +0000
commitff4d672e9e3aa4ebe831eb52f05b10f5ab145699 (patch)
treea4344d6e403e2bc16cba1e568245508a0a840b22 /ui
parentd0d2e2ac30baab168aed0ad9062195efcd45e7dc (diff)
downloadchromium_src-ff4d672e9e3aa4ebe831eb52f05b10f5ab145699.zip
chromium_src-ff4d672e9e3aa4ebe831eb52f05b10f5ab145699.tar.gz
chromium_src-ff4d672e9e3aa4ebe831eb52f05b10f5ab145699.tar.bz2
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
Diffstat (limited to 'ui')
-rw-r--r--ui/views/run_all_unittests.cc6
1 files changed, 5 insertions, 1 deletions
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);
};