Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1487)

Unified Diff: cc/test/test_common.h

Issue 11186039: Move CC switches to cc/switches.h. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Switch ui/compositor back to using compositorSupport() Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/switches.cc ('k') | cc/threaded_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « cc/switches.cc ('k') | cc/threaded_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698