Revert r74860 as it broke arm:

chrome/browser/dom_ui/options/about_page_handler.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/dom_ui/options/about_page_handler.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 45 matching lines @@
 const char kEndLinkCrosOss[] = "END_LINK_CROS_OSS";
 #endif
 
 // Returns a substring [start, end) from |text|.
 std::string StringSubRange(const std::string& text, size_t start,
                            size_t end) {
   DCHECK(end > start);
   return text.substr(start, end - start);
 }
 
+struct LocalizeEntry {
+  const char* identifier;
+  int resource;
+};
+
+const LocalizeEntry localize_table[] = {
+#if defined (OS_CHROMEOS)
+    { "product", IDS_PRODUCT_OS_NAME },
+    { "os", IDS_PRODUCT_OS_NAME },
+    { "loading", IDS_ABOUT_PAGE_LOADING },
+    { "check_now", IDS_ABOUT_PAGE_CHECK_NOW },
+    { "update_status", IDS_UPGRADE_CHECK_STARTED },
+    { "restart_now", IDS_RELAUNCH_AND_UPDATE },
+#else
+    { "product", IDS_PRODUCT_NAME },
+    { "check_now", IDS_ABOUT_CHROME_UPDATE_CHECK },
+#endif
+    { "browser", IDS_PRODUCT_NAME },
+    { "more_info", IDS_ABOUT_PAGE_MORE_INFO },
+    { "copyright", IDS_ABOUT_VERSION_COPYRIGHT },
+    { "channel", IDS_ABOUT_PAGE_CHANNEL },
+    { "release", IDS_ABOUT_PAGE_CHANNEL_RELEASE },
+    { "beta", IDS_ABOUT_PAGE_CHANNEL_BETA },
+    { "development", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT },
+    { "canary", IDS_ABOUT_PAGE_CHANNEL_CANARY },
+    { "channel_warning_header", IDS_ABOUT_PAGE_CHANNEL_WARNING_HEADER },
+    { "channel_warning_text", IDS_ABOUT_PAGE_CHANNEL_WARNING_TEXT },
+    { "user_agent", IDS_ABOUT_VERSION_USER_AGENT },
+    { "command_line", IDS_ABOUT_VERSION_COMMAND_LINE },
+};
+
+void LocalizedStrings(DictionaryValue* localized_strings) {
+  for (size_t n = 0; n != arraysize(localize_table); ++n) {
+    localized_strings->SetString(localize_table[n].identifier,
+        l10n_util::GetStringUTF16(localize_table[n].resource));
+  }
+}
+
 }  // namespace
 
 #if defined(OS_CHROMEOS)
 
 class AboutPageHandler::UpdateObserver
     : public chromeos::UpdateLibrary::Observer {
  public:
   explicit UpdateObserver(AboutPageHandler* handler) : page_handler_(handler) {}
   virtual ~UpdateObserver() {}
 
@@ skipping 22 matching lines @@
   if (update_observer_.get()) {
     chromeos::CrosLibrary::Get()->GetUpdateLibrary()->
         RemoveObserver(update_observer_.get());
   }
 #endif
 }
 
 void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
-  static OptionsStringResource resources[] = {
-#if defined (OS_CHROMEOS)
-    { "product", IDS_PRODUCT_OS_NAME },
-    { "os", IDS_PRODUCT_OS_NAME },
-    { "loading", IDS_ABOUT_PAGE_LOADING },
-    { "check_now", IDS_ABOUT_PAGE_CHECK_NOW },
-    { "update_status", IDS_UPGRADE_CHECK_STARTED },
-    { "restart_now", IDS_RELAUNCH_AND_UPDATE },
-#else
-    { "product", IDS_PRODUCT_NAME },
-    { "check_now", IDS_ABOUT_CHROME_UPDATE_CHECK },
-#endif
-    { "browser", IDS_PRODUCT_NAME },
-    { "more_info", IDS_ABOUT_PAGE_MORE_INFO },
-    { "copyright", IDS_ABOUT_VERSION_COPYRIGHT },
-    { "channel", IDS_ABOUT_PAGE_CHANNEL },
-    { "release", IDS_ABOUT_PAGE_CHANNEL_RELEASE },
-    { "beta", IDS_ABOUT_PAGE_CHANNEL_BETA },
-    { "development", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT },
-    { "canary", IDS_ABOUT_PAGE_CHANNEL_CANARY },
-    { "channel_warning_header", IDS_ABOUT_PAGE_CHANNEL_WARNING_HEADER },
-    { "channel_warning_text", IDS_ABOUT_PAGE_CHANNEL_WARNING_TEXT },
-    { "user_agent", IDS_ABOUT_VERSION_USER_AGENT },
-    { "command_line", IDS_ABOUT_VERSION_COMMAND_LINE },
-  };
+  LocalizedStrings(localized_strings);
 
-  RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "aboutPage", IDS_ABOUT_TAB_TITLE);
 
   // browser version
 
   chrome::VersionInfo version_info;
   DCHECK(version_info.is_valid());
 
   std::string browser_version = version_info.Version();
   std::string version_modifier = platform_util::GetVersionStringModifier();
   if (!version_modifier.empty())
@@ skipping 265 matching lines @@
 
 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle,
                                    std::string version) {
   if (version.size()) {
     scoped_ptr<Value> version_string(Value::CreateStringValue(version));
     web_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback",
                                     *version_string);
   }
 }
 #endif