| Index: chrome/common/jstemplate_builder.h
 | 
| diff --git a/chrome/common/jstemplate_builder.h b/chrome/common/jstemplate_builder.h
 | 
| index e1861d2ec890807c290cc87e4bd6166b542eae28..ac8285f53ca65a242f4a0d0a42f533ad4b947215 100644
 | 
| --- a/chrome/common/jstemplate_builder.h
 | 
| +++ b/chrome/common/jstemplate_builder.h
 | 
| @@ -16,29 +16,31 @@
 | 
|  #include <string>
 | 
|  
 | 
|  class DictionaryValue;
 | 
| +namespace base {
 | 
|  class StringPiece;
 | 
| +}
 | 
|  
 | 
|  namespace jstemplate_builder {
 | 
|  
 | 
|  // A helper function that generates a string of HTML to be loaded.  The
 | 
|  // string includes the HTML and the javascript code necessary to generate the
 | 
|  // full page with support for JsTemplates.
 | 
| -std::string GetTemplateHtml(const StringPiece& html_template,
 | 
| +std::string GetTemplateHtml(const base::StringPiece& html_template,
 | 
|                              const DictionaryValue* json,
 | 
| -                            const StringPiece& template_id);
 | 
| +                            const base::StringPiece& template_id);
 | 
|  
 | 
|  // A helper function that generates a string of HTML to be loaded.  The
 | 
|  // string includes the HTML and the javascript code necessary to generate the
 | 
|  // full page with support for i18n Templates.
 | 
| -std::string GetI18nTemplateHtml(const StringPiece& html_template,
 | 
| +std::string GetI18nTemplateHtml(const base::StringPiece& html_template,
 | 
|                                  const DictionaryValue* json);
 | 
|  
 | 
|  // A helper function that generates a string of HTML to be loaded.  The
 | 
|  // string includes the HTML and the javascript code necessary to generate the
 | 
|  // full page with support for both i18n Templates and JsTemplates.
 | 
| -std::string GetTemplatesHtml(const StringPiece& html_template,
 | 
| +std::string GetTemplatesHtml(const base::StringPiece& html_template,
 | 
|                               const DictionaryValue* json,
 | 
| -                             const StringPiece& template_id);
 | 
| +                             const base::StringPiece& template_id);
 | 
|  
 | 
|  // The following functions build up the different parts that the above
 | 
|  // templates use.
 | 
| @@ -52,7 +54,7 @@ void AppendJsTemplateSourceHtml(std::string* output);
 | 
|  
 | 
|  // Appends the code that processes the JsTemplate with the JSON. You should
 | 
|  // call AppendJsTemplateSourceHtml and AppendJsonHtml before calling this.
 | 
| -void AppendJsTemplateProcessHtml(const StringPiece& template_id,
 | 
| +void AppendJsTemplateProcessHtml(const base::StringPiece& template_id,
 | 
|                                   std::string* output);
 | 
|  
 | 
|  // Appends the source for i18n Templates in a script tag.
 | 
| 
 |