Add base namespace to more values in sync and elsewhere.

ui/webui/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 "ui/webui/jstemplate_builder.h"
 
 #include "base/json/json_file_value_serializer.h"
@@ skipping 15 matching lines @@
 
 UseVersion2::UseVersion2() {
   g_version2++;
 }
 
 UseVersion2::~UseVersion2() {
   g_version2--;
 }
 
 std::string GetTemplateHtml(const base::StringPiece& html_template,
-                            const DictionaryValue* json,
+                            const base::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;
 }
 
 std::string GetI18nTemplateHtml(const base::StringPiece& html_template,
-                                const DictionaryValue* json) {
+                                const base::DictionaryValue* json) {
   std::string output(html_template.data(), html_template.size());
   AppendJsonHtml(json, &output);
   AppendI18nTemplateSourceHtml(&output);
   AppendI18nTemplateProcessHtml(&output);
   return output;
 }
 
 std::string GetTemplatesHtml(const base::StringPiece& html_template,
-                             const DictionaryValue* json,
+                             const base::DictionaryValue* json,
                              const base::StringPiece& template_id) {
   std::string output(html_template.data(), html_template.size());
   AppendI18nTemplateSourceHtml(&output);
   AppendJsTemplateSourceHtml(&output);
   AppendJsonHtml(json, &output);
   AppendI18nTemplateProcessHtml(&output);
   AppendJsTemplateProcessHtml(template_id, &output);
   return output;
 }
 
-void AppendJsonHtml(const DictionaryValue* json, std::string* output) {
+void AppendJsonHtml(const base::DictionaryValue* json, std::string* output) {
   std::string javascript_string;
   AppendJsonJS(json, &javascript_string);
 
   // </ confuses the HTML parser because it could be a </script> tag.  So we
   // replace </ with <\/.  The extra \ will be ignored by the JS engine.
   ReplaceSubstringsAfterOffset(&javascript_string, 0, "</", "<\\/");
 
   output->append("<script>");
   output->append(javascript_string);
   output->append("</script>");
 }
 
-void AppendJsonJS(const DictionaryValue* json, std::string* output) {
+void AppendJsonJS(const base::DictionaryValue* json, std::string* output) {
   // Convert the template data to a json string.
   DCHECK(json) << "must include json data structure";
 
   std::string jstext;
   JSONStringValueSerializer serializer(&jstext);
   serializer.Serialize(*json);
   output->append(g_version2 ? "loadTimeData.data = " : "var templateData = ");
   output->append(jstext);
   output->append(";");
 }
@@ skipping 57 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 webui