Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Unified Diff: ui/app_list/test/app_list_test_suite.cc

Issue 10963040: app_list: Fix app_list_unittests crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/apps_grid_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/test/app_list_test_suite.cc
diff --git a/ui/app_list/test/app_list_test_suite.cc b/ui/app_list/test/app_list_test_suite.cc
index cfa88f1c1fbfc52f843176304a1cbbe6af5cdabf..e38a3482adc6473964ec3c7de3d8d855441d3b38 100644
--- a/ui/app_list/test/app_list_test_suite.cc
+++ b/ui/app_list/test/app_list_test_suite.cc
@@ -6,6 +6,8 @@
#include "ui/base/ui_base_paths.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/compositor_setup.h"
+#include "ui/compositor/test/compositor_test_support.h"
namespace app_list {
namespace test {
@@ -22,9 +24,13 @@ void AppListTestSuite::Initialize() {
// Force unittests to run using en-US so if we test against string
// output, it'll pass regardless of the system language.
ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+
+ ui::CompositorTestSupport::Initialize();
+ ui::SetupTestCompositor();
}
void AppListTestSuite::Shutdown() {
+ ui::CompositorTestSupport::Terminate();
ui::ResourceBundle::CleanupSharedInstance();
base::TestSuite::Shutdown();
« no previous file with comments | « ui/app_list/apps_grid_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698