fix jstemplate_builder::UseVersion2

chrome/common/jstemplate_builder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A helper function for using JsTemplate. See jstemplate_builder.h for more
 // info.
 
 #include "chrome/common/jstemplate_builder.h"
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "grit/common_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 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,
                             const DictionaryValue* json,
                             const base::StringPiece& template_id) {
   std::string output(html_template.data(), html_template.size());
   AppendJsonHtml(json, &output);
   AppendJsTemplateSourceHtml(&output);
   AppendJsTemplateProcessHtml(template_id, &output);
   return output;
@@ skipping 104 matching lines @@
     NOTREACHED() << "Unable to get i18n process src";
     return;
   }
 
   output->append("<script>");
   output->append(i18n_process_src.data(), i18n_process_src.size());
   output->append("</script>");
 }
 
 }  // namespace jstemplate_builder