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

Unified Diff: ui/compositor/test/in_process_context_factory.cc

Issue 468393005: app_shell: Shut down in response to power button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a comment Created 6 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
Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index fbc4c813cc0eee2536ebce2ed57f2ef73788d7cd..63050bb9b7cd4343b84599ad0f5401fe0b2e8794 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -20,7 +20,14 @@ namespace ui {
InProcessContextFactory::InProcessContextFactory()
: shared_bitmap_manager_(new cc::TestSharedBitmapManager()) {
+#if defined(UNIT_TEST)
James Cook 2014/08/23 00:55:00 I'm not sure this works. In particular, I think on
Daniel Erat 2014/08/23 02:21:31 what you write makes sense. it worked when i teste
+ CHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone)
+ << "Ensure that the test binary's main() is calling "
+ << "gfx::GLSurface::InitializeOneOffForTests()";
+#else
DCHECK_NE(gfx::GetGLImplementation(), gfx::kGLImplementationNone);
+#endif
+
#if defined(OS_CHROMEOS)
bool use_thread = !CommandLine::ForCurrentProcess()->HasSwitch(
switches::kUIDisableThreadedCompositing);
« extensions/test/extensions_unittests_main.cc ('K') | « extensions/test/extensions_unittests_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698