| Index: cc/test/CCTestCommon.h
|
| diff --git a/cc/test/CCTestCommon.h b/cc/test/CCTestCommon.h
|
| index c748744750b007ba6d015041a6bbb9f1edf686b3..3556e10dcf41ee67c4eb444a205de53002db7482 100644
|
| --- a/cc/test/CCTestCommon.h
|
| +++ b/cc/test/CCTestCommon.h
|
| @@ -2,21 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCTestCommon_h
|
| -#define CCTestCommon_h
|
| -
|
| -#include "CCSettings.h"
|
| -
|
| -namespace WebKitTests {
|
| -
|
| -// If you have a test that modifies or uses global settings, keep an instance
|
| -// of this class to ensure that you start and end with a clean slate.
|
| -class CCScopedSettings {
|
| -public:
|
| - CCScopedSettings() { cc::CCSettings::reset(); }
|
| - ~CCScopedSettings() { cc::CCSettings::reset(); }
|
| -};
|
| -
|
| -} // namespace WebKitTests
|
| -
|
| -#endif // CCTestCommon_h
|
| +// Temporary forwarding header
|
| +#include "cc/test/test_common.h"
|
|
|