Remove some string IDS' _NEW_STYLE suffix and some unused IDS.

chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

 // Copyright 2013 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/ui/views/sync/profile_signin_confirmation_dialog_views.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 63 matching lines @@
 }
 
 void ProfileSigninConfirmationDialogViews::Show(bool prompt_for_new_profile) {
   prompt_for_new_profile_ = prompt_for_new_profile;
   constrained_window::CreateBrowserModalDialogViews(
       this, browser_->window()->GetNativeWindow())->Show();
 }
 
 base::string16 ProfileSigninConfirmationDialogViews::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(
-      IDS_ENTERPRISE_SIGNIN_TITLE_NEW_STYLE);
+      IDS_ENTERPRISE_SIGNIN_TITLE);
 }
 
 base::string16 ProfileSigninConfirmationDialogViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK) {
     // If we're giving the option to create a new profile, then OK is
     // "Create new profile".  Otherwise it is "Continue signin".
     return l10n_util::GetStringUTF16(
         prompt_for_new_profile_ ?
-            IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NEW_STYLE :
-            IDS_ENTERPRISE_SIGNIN_CONTINUE_NEW_STYLE);
+            IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE :
+            IDS_ENTERPRISE_SIGNIN_CONTINUE);
   }
   return l10n_util::GetStringUTF16(IDS_ENTERPRISE_SIGNIN_CANCEL);
 }
 
 int ProfileSigninConfirmationDialogViews::GetDefaultDialogButton() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
 views::View* ProfileSigninConfirmationDialogViews::CreateExtraView() {
   if (!prompt_for_new_profile_)
     return nullptr;
 
   const base::string16 continue_signin_text =
-      l10n_util::GetStringUTF16(IDS_ENTERPRISE_SIGNIN_CONTINUE_NEW_STYLE);
+      l10n_util::GetStringUTF16(IDS_ENTERPRISE_SIGNIN_CONTINUE);
   return views::MdTextButton::CreateSecondaryUiButton(this,
                                                       continue_signin_text);
 }
 
 bool ProfileSigninConfirmationDialogViews::Accept() {
   if (delegate_) {
     if (prompt_for_new_profile_)
       delegate_->OnSigninWithNewProfile();
     else
       delegate_->OnContinueSignin();
@@ skipping 24 matching lines @@
       ui::GetSigninConfirmationPromptBarColor(
           GetNativeTheme(), ui::kSigninConfirmationPromptBarBackgroundAlpha);
 
   // Create the prompt label.
   size_t offset;
   const base::string16 domain =
       base::ASCIIToUTF16(gaia::ExtractDomainName(username_));
   const base::string16 username = base::ASCIIToUTF16(username_);
   const base::string16 prompt_text =
       l10n_util::GetStringFUTF16(
-          IDS_ENTERPRISE_SIGNIN_ALERT_NEW_STYLE,
+          IDS_ENTERPRISE_SIGNIN_ALERT,
           domain, &offset);
   views::StyledLabel* prompt_label = new views::StyledLabel(prompt_text, this);
   prompt_label->SetDisplayedOnBackgroundColor(kPromptBarBackgroundColor);
 
   views::StyledLabel::RangeStyleInfo bold_style;
   bold_style.weight = gfx::Font::Weight::BOLD;
   prompt_label->AddStyleRange(
       gfx::Range(offset, offset + domain.size()), bold_style);
 
   // Create the prompt bar.
   views::View* prompt_bar = new views::View;
   prompt_bar->SetBorder(views::CreateSolidSidedBorder(
       1, 0, 1, 0,
       ui::GetSigninConfirmationPromptBarColor(
           GetNativeTheme(), ui::kSigninConfirmationPromptBarBorderAlpha)));
   prompt_bar->set_background(views::Background::CreateSolidBackground(
       kPromptBarBackgroundColor));
 
   // Create the explanation label.
   std::vector<size_t> offsets;
   const base::string16 learn_more_text =
       l10n_util::GetStringUTF16(
           IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE);
   const base::string16 signin_explanation_text =
       l10n_util::GetStringFUTF16(prompt_for_new_profile_ ?
-          IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW_STYLE :
-          IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION_NEW_STYLE,
+          IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION :
+          IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION,
           username, learn_more_text, &offsets);
   views::StyledLabel* explanation_label =
       new views::StyledLabel(signin_explanation_text, this);
   explanation_label->AddStyleRange(
       gfx::Range(offsets[1], offsets[1] + learn_more_text.size()),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
 
   // Layout the components.
   views::GridLayout* dialog_layout = new views::GridLayout(this);
   dialog_layout->SetInsets(views::kPanelVertMargin, 0, 0, 0);
@@ skipping 51 matching lines @@
 void ProfileSigninConfirmationDialogViews::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   DCHECK(prompt_for_new_profile_);
   if (delegate_) {
     delegate_->OnContinueSignin();
     delegate_ = NULL;
   }
   GetWidget()->Close();
 }