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

Unified Diff: content/test/content_test_suite.cc

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 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: content/test/content_test_suite.cc
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index c962fb38a27308edcc6bc9aa225bee6b29996d09..1307aaa2d264b9fd907115e05b87f942d8b680ac 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -13,6 +13,7 @@
#include "content/test/test_content_client.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ui_base_paths.h"
+#include "ui/gfx/compositor/compositor_test_support.h"
namespace {
@@ -65,6 +66,9 @@ void ContentTestSuite::Initialize() {
content::RegisterPathProvider();
ui::RegisterPathProvider();
+ // Mock out the compositor on platforms that use it.
+ ui::CompositorTestSupport::SetupMockCompositor();
+
testing::TestEventListeners& listeners =
testing::UnitTest::GetInstance()->listeners();
listeners.Append(new TestContentClientInitializer);

Powered by Google App Engine
This is Rietveld 408576698