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

Unified Diff: content/test/content_test_suite.cc

Issue 8404041: Revert 107563 - Fix up compositor mocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « content/content_tests.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_suite.cc
===================================================================
--- content/test/content_test_suite.cc (revision 107563)
+++ content/test/content_test_suite.cc (working copy)
@@ -13,7 +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/test/gfx_test_utils.h"
+#include "ui/gfx/compositor/compositor_test_support.h"
namespace {
@@ -67,7 +67,7 @@
ui::RegisterPathProvider();
// Mock out the compositor on platforms that use it.
- ui::gfx_test_utils::SetupTestCompositor();
+ ui::CompositorTestSupport::SetupMockCompositor();
testing::TestEventListeners& listeners =
testing::UnitTest::GetInstance()->listeners();
Property changes on: content/test/content_test_suite.cc
___________________________________________________________________
Deleted: svn:mergeinfo
« no previous file with comments | « content/content_tests.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698