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

Unified Diff: ash/test/test_shell_delegate.cc

Issue 45963003: Move test-only ContextFactory implementations out of production targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert bad ui/base changes Created 7 years, 2 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
Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index b7a4823d936dac2aaeeae36958595a363dd2c013..7676e422ec194f0ab5b34404b03377cc79e75032 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -23,7 +23,6 @@
#include "base/logging.h"
#include "content/public/test/test_browser_context.h"
#include "ui/aura/window.h"
-#include "ui/compositor/compositor.h"
namespace ash {
namespace test {
@@ -142,10 +141,6 @@ ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::Window* root) {
}
RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
- // The ContextFactory must exist before any Compositors are created.
- bool allow_test_contexts = true;
- ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
-
return RootWindowHostFactory::Create();
}

Powered by Google App Engine
This is Rietveld 408576698