| Index: cc/test/test_common.h
|
| diff --git a/cc/test/test_common.h b/cc/test/test_common.h
|
| index c748744750b007ba6d015041a6bbb9f1edf686b3..572a5c972e0daac476f38b2b21b4aa04a2ef67ac 100644
|
| --- a/cc/test/test_common.h
|
| +++ b/cc/test/test_common.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef CCTestCommon_h
|
| #define CCTestCommon_h
|
|
|
| -#include "CCSettings.h"
|
| +#include "cc/settings.h"
|
|
|
| namespace WebKitTests {
|
|
|
| @@ -13,8 +13,8 @@ namespace WebKitTests {
|
| // 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(); }
|
| + CCScopedSettings() { cc::Settings::resetForTest(); }
|
| + ~CCScopedSettings() { cc::Settings::resetForTest(); }
|
| };
|
|
|
| } // namespace WebKitTests
|
|
|