| Index: cc/blink/test/cc_blink_test_suite.cc
|
| diff --git a/cc/test/cc_test_suite.cc b/cc/blink/test/cc_blink_test_suite.cc
|
| similarity index 54%
|
| copy from cc/test/cc_test_suite.cc
|
| copy to cc/blink/test/cc_blink_test_suite.cc
|
| index f48f10a83acafb6dd3023b952b1082a1dde88a3a..6202cfd3b0774276b778cc22e7cca66003d0e1d9 100644
|
| --- a/cc/test/cc_test_suite.cc
|
| +++ b/cc/blink/test/cc_blink_test_suite.cc
|
| @@ -1,25 +1,21 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2015 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 "cc/blink/test/cc_blink_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/gl_surface.h"
|
|
|
| -namespace cc {
|
| +namespace cc_blink {
|
|
|
| -CCTestSuite::CCTestSuite(int argc, char** argv)
|
| +CCBlinkTestSuite::CCBlinkTestSuite(int argc, char** argv)
|
| : base::TestSuite(argc, argv) {}
|
|
|
| -CCTestSuite::~CCTestSuite() {}
|
| +CCBlinkTestSuite::~CCBlinkTestSuite() {}
|
|
|
| -void CCTestSuite::Initialize() {
|
| +void CCBlinkTestSuite::Initialize() {
|
| base::TestSuite::Initialize();
|
| - gfx::GLSurface::InitializeOneOffForTests();
|
| - CCPaths::RegisterPathProvider();
|
|
|
| message_loop_.reset(new base::MessageLoop);
|
|
|
| @@ -28,10 +24,10 @@ void CCTestSuite::Initialize() {
|
| "Main");
|
| }
|
|
|
| -void CCTestSuite::Shutdown() {
|
| +void CCBlinkTestSuite::Shutdown() {
|
| message_loop_ = nullptr;
|
|
|
| base::TestSuite::Shutdown();
|
| }
|
|
|
| -} // namespace cc
|
| +} // namespace cc_blink
|
|
|