Polish about:conflicts a bit as requested by Clem/UI review....

chrome/browser/dom_ui/conflicts_ui.cc

 // Copyright (c) 2010 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/conflicts_ui.h"
 
 #if defined(OS_WIN)
 
 #include <string>
 
@@ skipping 61 matching lines @@
   localized_strings.SetString("investigatingText",
       l10n_util::GetStringUTF16(IDS_CONFLICTS_CHECK_INVESTIGATING));
   localized_strings.SetString("modulesNoneLoaded",
       l10n_util::GetStringUTF16(IDS_CONFLICTS_NO_MODULES_LOADED));
   localized_strings.SetString("headerSoftware",
       l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_SOFTWARE));
   localized_strings.SetString("headerSignedBy",
       l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_SIGNED_BY));
   localized_strings.SetString("headerLocation",
       l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_LOCATION));
-  localized_strings.SetString("headerWarning",
-      l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_WARNING));
+  localized_strings.SetString("headerVersion",
+      l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_VERSION));
   localized_strings.SetString("headerHelpTip",
       l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_HELP_TIP));
 
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece flags_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_ABOUT_CONFLICTS_HTML));
   std::string full_html(flags_html.data(), flags_html.size());
   jstemplate_builder::AppendJsonHtml(&localized_strings, &full_html);
   jstemplate_builder::AppendI18nTemplateSourceHtml(&full_html);
   jstemplate_builder::AppendI18nTemplateProcessHtml(&full_html);
   jstemplate_builder::AppendJsTemplateSourceHtml(&full_html);
 
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
   html_bytes->data.resize(full_html.size());
   std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
 
   SendResponse(request_id, html_bytes);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ConflictsDOMHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-// The handler for Javascript messages for the about:flags page.
+// The handler for JavaScript messages for the about:flags page.
 class ConflictsDOMHandler : public DOMMessageHandler,
                             public NotificationObserver {
  public:
   ConflictsDOMHandler() {}
   virtual ~ConflictsDOMHandler() {}
 
   // DOMMessageHandler implementation.
   virtual void RegisterMessages();
 
   // Callback for the "requestModuleList" message.
@@ skipping 87 matching lines @@
                         make_scoped_refptr(html_source)));
 }
 
 // static
 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
 }
 
 #endif