| 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
|
|
|
|
|