m_foo -> foo_ in SettingsMacros, fix DEBUG_TEXT_AUTOSIZING_ON_DESKTOP build.

third_party/WebKit/Source/build/scripts/templates/SettingsMacros.h.tmpl

Index: third_party/WebKit/Source/build/scripts/templates/SettingsMacros.h.tmpl
diff --git a/third_party/WebKit/Source/build/scripts/templates/SettingsMacros.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/SettingsMacros.h.tmpl
index 18e5f9cca31a51b1793109bcdef5ab96d061f882..51133c80afed67afd56b811e4d0bdec80ddb95a9 100644
--- a/third_party/WebKit/Source/build/scripts/templates/SettingsMacros.h.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/SettingsMacros.h.tmpl
@@ -6,42 +6,42 @@
 
 #define SETTINGS_GETTERS_AND_SETTERS \
     {% for setting in settings %}
-    {{setting.type|to_passing_type}} Get{{setting.name|upper_first}}() const { return m_{{setting.name}}; } \
+    {{setting.type|to_passing_type}} Get{{setting.name|upper_first}}() const { return {{setting.name}}_; } \
     void Set{{setting.name|upper_first}}({{setting.type|to_passing_type}} {{setting.name}}); \
     {% endfor %}
-    void setFromStrings(const String& name, const String& value);
+    void SetFromStrings(const String& name, const String& value);
 // End of SETTINGS_GETTERS_AND_SETTERS.
 
 #define SETTINGS_MEMBER_VARIABLES \
     {% for setting in settings if setting.type != 'bool' %}
-    {{setting.type}} m_{{setting.name}}; \
+    {{setting.type}} {{setting.name}}_; \
     {% endfor %}
     {% for setting in settings if setting.type == 'bool' %}
-    bool m_{{setting.name}} : 1; \
+    bool {{setting.name}}_ : 1; \
     {% endfor %}
 // End of SETTINGS_MEMBER_VARIABLES.
 
 #define SETTINGS_INITIALIZER_LIST \
     {% for setting in settings if setting.initial is not none and setting.type != 'bool' %}
-    , m_{{setting.name}}({{setting.initial}}) \
+    , {{setting.name}}_({{setting.initial}}) \
     {% endfor %}
     {% for setting in settings if setting.initial is not none and setting.type == 'bool' %}
-    , m_{{setting.name}}({{setting.initial|cpp_bool}}) \
+    , {{setting.name}}_({{setting.initial|cpp_bool}}) \
     {% endfor %}
 // End of SETTINGS_INITIALIZER_LIST.
 
 #define SETTINGS_SETTER_BODIES \
 {% for setting in settings %}
 void Settings::Set{{setting.name|upper_first}}({{setting.type|to_passing_type}} {{setting.name}}) { \
-  if (m_{{setting.name}} == {{setting.name}}) \
+  if ({{setting.name}}_ == {{setting.name}}) \
     return; \
-  m_{{setting.name}} = {{setting.name}}; \
+  {{setting.name}}_ = {{setting.name}}; \
   {% if setting.invalidate %}
   Invalidate(SettingsDelegate::k{{setting.invalidate}}Change); \
   {% endif  %}
 } \
 {% endfor %}
-void Settings::setFromStrings(const String& name, const String& value) { \
+void Settings::SetFromStrings(const String& name, const String& value) { \
   {% for setting in settings %}
   if (name == "{{setting.name}}") { \
     Set{{setting.name|upper_first}}( \