fix jstemplate_builder::UseVersion2

chrome/common/jstemplate_builder.cc

Index: chrome/common/jstemplate_builder.cc
diff --git a/chrome/common/jstemplate_builder.cc b/chrome/common/jstemplate_builder.cc
index eb956743929214cb1cec72a5e9169f7e5e736f4e..9d0d46b5db0a5299113dfd9e68963dc5d909e39e 100644
--- a/chrome/common/jstemplate_builder.cc
+++ b/chrome/common/jstemplate_builder.cc
@@ -16,19 +16,19 @@
 
 namespace {
 
-// True when building version 2 templates. See UseVersion2 class.
-bool g_version2 = false;
+// Non-zero when building version 2 templates. See UseVersion2 class.
+int g_version2 = 0;
 
 }  // namespace
 
 namespace jstemplate_builder {
 
-UseVersion2::UseVersion2() : previous_value_(g_version2) {
-  g_version2 = true;
+UseVersion2::UseVersion2() {
+  g_version2++;
 }
 
 UseVersion2::~UseVersion2() {
-  g_version2 = previous_value_;
+  g_version2--;
 }
 
 std::string GetTemplateHtml(const base::StringPiece& html_template,