| Index: components/display_compositor/display_compositor_test_suite.cc
|
| diff --git a/cc/test/cc_test_suite.cc b/components/display_compositor/display_compositor_test_suite.cc
|
| similarity index 55%
|
| copy from cc/test/cc_test_suite.cc
|
| copy to components/display_compositor/display_compositor_test_suite.cc
|
| index 0fa0b543c52294d8eb37c6d21ccf0cda579a933e..054f67604579088a6b6d0cc793f5090016f92d45 100644
|
| --- a/cc/test/cc_test_suite.cc
|
| +++ b/components/display_compositor/display_compositor_test_suite.cc
|
| @@ -1,39 +1,38 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "cc/test/cc_test_suite.h"
|
| +#include "components/display_compositor/display_compositor_test_suite.h"
|
|
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/threading/thread_id_name_manager.h"
|
| #include "cc/test/paths.h"
|
| #include "ui/gl/test/gl_surface_test_support.h"
|
|
|
| -namespace cc {
|
| +namespace display_compositor {
|
|
|
| -CCTestSuite::CCTestSuite(int argc, char** argv)
|
| +DisplayCompositorTestSuite::DisplayCompositorTestSuite(int argc, char** argv)
|
| : base::TestSuite(argc, argv) {}
|
|
|
| -CCTestSuite::~CCTestSuite() {}
|
| +DisplayCompositorTestSuite::~DisplayCompositorTestSuite() {}
|
|
|
| -void CCTestSuite::Initialize() {
|
| +void DisplayCompositorTestSuite::Initialize() {
|
| base::TestSuite::Initialize();
|
| gfx::GLSurfaceTestSupport::InitializeOneOff();
|
| - CCPaths::RegisterPathProvider();
|
| + cc::CCPaths::RegisterPathProvider();
|
|
|
| message_loop_.reset(new base::MessageLoop);
|
|
|
| base::ThreadIdNameManager::GetInstance()->SetName(
|
| - base::PlatformThread::CurrentId(),
|
| - "Main");
|
| + base::PlatformThread::CurrentId(), "Main");
|
|
|
| base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
|
| }
|
|
|
| -void CCTestSuite::Shutdown() {
|
| +void DisplayCompositorTestSuite::Shutdown() {
|
| message_loop_ = nullptr;
|
|
|
| base::TestSuite::Shutdown();
|
| }
|
|
|
| -} // namespace cc
|
| +} // namespace display_compositor
|
|
|