i18n_template2.js for uber_frame.html

BUG=122753

Review URL: https://chromiumcodereview.appspot.com/10832358

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152145 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/uber/uber_frame.html

@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="uber_frame.css">
 
 <script src="chrome://resources/js/cr.js"></script>
+<script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://uber-frame/uber_frame.js"></script>
 </head>
 
@@ -33,8 +34,7 @@
 </ul>
 
 <script src="chrome://uber-frame/strings.js"></script>
-<script src="chrome://resources/js/i18n_template.js"></script>
-<script src="chrome://resources/js/i18n_process.js"></script>
+<script src="chrome://resources/js/i18n_template2.js"></script>
 
 </body>
 </html>

chrome/browser/ui/webui/uber/uber_ui.cc

@@ -37,6 +37,7 @@ ChromeWebUIDataSource* CreateUberHTMLSource() {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIUberHost);
 
+  source->set_use_json_js_format_v2();
   source->set_json_path("strings.js");
   source->add_resource_path("uber.js", IDR_UBER_JS);
   source->add_resource_path("uber_utils.js", IDR_UBER_UTILS_JS);
@@ -62,8 +63,6 @@ ChromeWebUIDataSource* CreateUberHTMLSource() {
   source->AddString("settingsHost",
                     ASCIIToUTF16(chrome::kChromeUISettingsHost));
 
-  source->set_use_json_js_format_v2();
-
   return source;
 }
 
@@ -90,6 +89,7 @@ ChromeWebUIDataSource* CreateUberFrameHTMLSource(Profile* profile) {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIUberFrameHost);
 
+  source->set_use_json_js_format_v2();
   source->set_json_path("strings.js");
   source->add_resource_path("uber_frame.js", IDR_UBER_FRAME_JS);
   source->set_default_resource(IDR_UBER_FRAME_HTML);