retry 137554 - convert help page to loadTimeData

BUG=122753
TEST=manual

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

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

5 files changed, 39 insertions, 16 deletions

diff --git a/chrome/browser/resources/help/help.html b/chrome/browser/resources/help/help.html
index 86f67bf..ab4dfa1 100644
--- a/chrome/browser/resources/help/help.html
+++ b/chrome/browser/resources/help/help.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../uber/uber_shared.css">
   <link rel="stylesheet" href="help.css">
   <script src="chrome://resources/js/cr.js"></script>
-  <script src="chrome://resources/js/local_strings.js"></script>
+  <script src="chrome://resources/js/load_time_data.js"></script>
   <script src="chrome://resources/js/util.js"></script>
   <script src="chrome://help-frame/help.js"></script>
 </head>
@@ -78,7 +78,9 @@
       </div>
       <div id="update-buttons-container">
         <div id="update-percentage" hidden></div>
+<if expr="is_macosx">
         <button id="promote" i18n-content="promote" hidden></button>
+</if>
         <button id="relaunch" i18n-content="relaunch" hidden></button>
       </div>
 </if>
@@ -97,6 +99,5 @@
   </div>
 </body>
 <script src="chrome://help-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>
 </html>
diff --git a/chrome/browser/resources/help/help.js b/chrome/browser/resources/help/help.js
index ac3e93d..9a898b8 100644
--- a/chrome/browser/resources/help/help.js
+++ b/chrome/browser/resources/help/help.js
@@ -5,8 +5,6 @@
 <include src="../uber/uber_utils.js">
 
 cr.define('help', function() {
-  var localStrings = new LocalStrings();
-
   /**
    * Encapsulated handling of the help page.
    */
@@ -24,17 +22,18 @@ cr.define('help', function() {
       uber.onContentFrameLoaded();
 
       // Set the title.
-      var title = localStrings.getString('helpTitle');
+      var title = loadTimeData.getString('helpTitle');
       uber.invokeMethodOnParent('setTitle', {title: title});
 
-      $('product-license').innerHTML = localStrings.getString('productLicense');
-      if (cr.isChromeOS)
+      $('product-license').innerHTML = loadTimeData.getString('productLicense');
+      if (cr.isChromeOS) {
         $('product-os-license').innerHTML =
-            localStrings.getString('productOsLicense');
+            loadTimeData.getString('productOsLicense');
+      }
 
       var productTOS = $('product-tos');
       if (productTOS)
-        productTOS.innerHTML = localStrings.getString('productTOS');
+        productTOS.innerHTML = loadTimeData.getString('productTOS');
 
       $('get-help').onclick = chrome.send.bind(chrome, 'openHelpPage');
       $('report-issue').onclick =
@@ -71,8 +70,8 @@ cr.define('help', function() {
       moreInfo.style.height = visible ? '' : moreInfo.scrollHeight + 'px';
       moreInfo.addEventListener('webkitTransitionEnd', function(event) {
         $('more-info-expander').textContent = visible ?
-            localStrings.getString('showMoreInfo') :
-                localStrings.getString('hideMoreInfo');
+            loadTimeData.getString('showMoreInfo') :
+            loadTimeData.getString('hideMoreInfo');
       });
     },
 
@@ -99,17 +98,17 @@ cr.define('help', function() {
       if (status == 'checking') {
         this.setUpdateImage_('working');
         $('update-status').innerHTML =
-            localStrings.getString('updateCheckStarted');
+            loadTimeData.getString('updateCheckStarted');
       } else if (status == 'updating') {
         this.setUpdateImage_('working');
-        $('update-status').innerHTML = localStrings.getString('updating');
+        $('update-status').innerHTML = loadTimeData.getString('updating');
       } else if (status == 'nearly_updated') {
         this.setUpdateImage_('up-to-date');
         $('update-status').innerHTML =
-            localStrings.getString('updateAlmostDone');
+            loadTimeData.getString('updateAlmostDone');
       } else if (status == 'updated') {
         this.setUpdateImage_('up-to-date');
-        $('update-status').innerHTML = localStrings.getString('upToDate');
+        $('update-status').innerHTML = loadTimeData.getString('upToDate');
       } else if (status == 'failed') {
         this.setUpdateImage_('failed');
         $('update-status').innerHTML = message;
diff --git a/chrome/browser/ui/webui/help/help_browsertest.js b/chrome/browser/ui/webui/help/help_browsertest.js
new file mode 100644
index 0000000..77d4481
--- /dev/null
+++ b/chrome/browser/ui/webui/help/help_browsertest.js
@@ -0,0 +1,21 @@
+// 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.
+
+/**
+ * TestFixture for extension settings WebUI testing.
+ * @extends {testing.Test}
+ * @constructor
+ */
+function HelpPageWebUITest() {}
+
+HelpPageWebUITest.prototype = {
+  __proto__: testing.Test.prototype,
+
+  browsePreload: 'chrome://help-frame/',
+};
+
+// Test opening extension settings has correct location.
+TEST_F('HelpPageWebUITest', 'testOpenHelpPage', function() {
+  assertEquals(this.browsePreload, document.location.href);
+});
diff --git a/chrome/browser/ui/webui/help/help_ui.cc b/chrome/browser/ui/webui/help/help_ui.cc
index 0c53d19..88ef864 100644
--- a/chrome/browser/ui/webui/help/help_ui.cc
+++ b/chrome/browser/ui/webui/help/help_ui.cc
@@ -21,6 +21,7 @@ ChromeWebUIDataSource* CreateAboutPageHTMLSource() {
       new ChromeWebUIDataSource(chrome::kChromeUIHelpFrameHost);
 
   source->set_json_path("strings.js");
+  source->set_use_json_js_format_v2();
   source->add_resource_path("help.js", IDR_HELP_JS);
   source->set_default_resource(IDR_HELP_HTML);
   return source;
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a2d5364..091e73b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2853,6 +2853,7 @@
         'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc',
         'browser/ui/views/web_dialog_view_browsertest.cc',
         'browser/ui/webui/chrome_url_data_manager_browsertest.cc',
+        'browser/ui/webui/help/help_browsertest.js',
         'browser/ui/webui/ntp/most_visited_browsertest.cc',
         'browser/ui/webui/test_chrome_web_ui_controller_factory_browsertest.cc',
         'browser/ui/webui/bidi_checker_web_ui_test.cc',