Merge 62826 - Fix DCHECK caused by passing a parameter to a string that doesn...

chrome/browser/dom_ui/flags_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/flags_ui.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 48 matching lines @@
   // Strings used in the JsTemplate file.
   DictionaryValue localized_strings;
   localized_strings.SetString("flagsLongTitle",
       l10n_util::GetStringUTF16(IDS_FLAGS_LONG_TITLE));
   localized_strings.SetString("flagsTableTitle",
       l10n_util::GetStringUTF16(IDS_FLAGS_TABLE_TITLE));
   localized_strings.SetString("flagsNoExperimentsAvailable",
       l10n_util::GetStringUTF16(IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE));
   localized_strings.SetString("flagsWarningHeader", l10n_util::GetStringUTF16(
       IDS_FLAGS_WARNING_HEADER));
-  localized_strings.SetString("flagsBlurb", l10n_util::GetStringFUTF16(
-      IDS_FLAGS_WARNING_TEXT,
-      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  localized_strings.SetString("flagsBlurb", l10n_util::GetStringUTF16(
+      IDS_FLAGS_WARNING_TEXT));
   localized_strings.SetString("flagsRestartNotice", l10n_util::GetStringFUTF16(
       IDS_FLAGS_RESTART_NOTICE,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings.SetString("flagsRestartButton",
       l10n_util::GetStringUTF16(IDS_FLAGS_RESTART_BUTTON));
   localized_strings.SetString("disable",
       l10n_util::GetStringUTF16(IDS_FLAGS_DISABLE));
   localized_strings.SetString("enable",
       l10n_util::GetStringUTF16(IDS_FLAGS_ENABLE));
 
@@ skipping 110 matching lines @@
 // static
 RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_FLAGS);
 }
 
 // static
 void FlagsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
 }