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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ash/test/test_suite.cc

Issue 22648006: Revert 216780 "Clean up compositor initialization/destruction." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | « trunk/src/ash/test/test_shell_delegate.cc ('k') | trunk/src/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/test/test_suite.cc
===================================================================
--- trunk/src/ash/test/test_suite.cc (revision 216906)
+++ trunk/src/ash/test/test_suite.cc (working copy)
@@ -12,6 +12,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
+#include "ui/compositor/compositor_setup.h"
#include "ui/gfx/gfx_paths.h"
#if defined(OS_MACOSX)
@@ -54,6 +55,7 @@
// 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::SetupTestCompositor();
}
void AuraShellTestSuite::Shutdown() {
« no previous file with comments | « trunk/src/ash/test/test_shell_delegate.cc ('k') | trunk/src/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698