| OLD | NEW | 
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CCTestCommon_h | 5 #ifndef CCTestCommon_h | 
| 6 #define CCTestCommon_h | 6 #define CCTestCommon_h | 
| 7 | 7 | 
| 8 #include "CCSettings.h" | 8 #include "cc/settings.h" | 
| 9 | 9 | 
| 10 namespace WebKitTests { | 10 namespace WebKitTests { | 
| 11 | 11 | 
| 12 // If you have a test that modifies or uses global settings, keep an instance | 12 // If you have a test that modifies or uses global settings, keep an instance | 
| 13 // of this class to ensure that you start and end with a clean slate. | 13 // of this class to ensure that you start and end with a clean slate. | 
| 14 class CCScopedSettings { | 14 class CCScopedSettings { | 
| 15 public: | 15 public: | 
| 16     CCScopedSettings() { cc::CCSettings::reset(); } | 16     CCScopedSettings() { cc::Settings::resetForTest(); } | 
| 17     ~CCScopedSettings() { cc::CCSettings::reset(); } | 17     ~CCScopedSettings() { cc::Settings::resetForTest(); } | 
| 18 }; | 18 }; | 
| 19 | 19 | 
| 20 } // namespace WebKitTests | 20 } // namespace WebKitTests | 
| 21 | 21 | 
| 22 #endif // CCTestCommon_h | 22 #endif // CCTestCommon_h | 
| OLD | NEW | 
|---|