2 files changed, 22 insertions, 0 deletions
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;