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

chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 170 matching lines @@
   // | [create]      [cancel] [ok] |
   // -------------------------------
 
   // The width of the dialog should be sufficient to fit the buttons on
   // one line and the title and the close button on one line, but not
   // smaller than kWindowMinWidth.  Therefore we first layout the title
   // and the buttons and then compute the necessary width.
 
   // OK button.
   [self addButton:okButton_
-        withTitle:IDS_ENTERPRISE_SIGNIN_CONTINUE_NEW_STYLE
+        withTitle:IDS_ENTERPRISE_SIGNIN_CONTINUE
            target:self
            action:@selector(ok:)
    shouldAutoSize:YES];
 
   // Cancel button.
   [self addButton:cancelButton_
         withTitle:IDS_ENTERPRISE_SIGNIN_CANCEL
            target:self
            action:@selector(cancel:)
    shouldAutoSize:YES];
 
   // Add the close button.
   [self addButton:closeButton_
         withTitle:0
            target:self
            action:@selector(close:)
    shouldAutoSize:NO];
   NSRect closeButtonFrame = [closeButton_ frame];
   closeButtonFrame.size.width = chrome_style::GetCloseButtonSize();
   closeButtonFrame.size.height = chrome_style::GetCloseButtonSize();
   [closeButton_ setFrame:closeButtonFrame];
 
   // Create Profile link.
   if (offerProfileCreation_) {
     [self addButton:createProfileButton_
-          withTitle:IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE_NEW_STYLE
+          withTitle:IDS_ENTERPRISE_SIGNIN_CREATE_NEW_PROFILE
              target:self
              action:@selector(createProfile:)
      shouldAutoSize:YES];
   }
 
   // Add the title label.
   titleField_.reset(
       [AddTextField([self view],
                     l10n_util::GetStringUTF16(
-                        IDS_ENTERPRISE_SIGNIN_TITLE_NEW_STYLE),
+                        IDS_ENTERPRISE_SIGNIN_TITLE),
                     chrome_style::kTitleFontStyle) retain]);
   [titleField_ setFrame:ComputeFrame(
       [titleField_ attributedStringValue], 0.0, 0.0)];
 
   // Compute the dialog width using the title and buttons.
   const CGFloat buttonsWidth =
       (offerProfileCreation_ ? NSWidth([createProfileButton_ frame]) : 0) +
       kButtonGap + NSWidth([cancelButton_ frame]) +
       kButtonGap + NSWidth([okButton_ frame]);
   const CGFloat titleWidth =
@@ skipping 23 matching lines @@
   [promptBox_ setTitlePosition:NSNoTitle];
   [[self view] addSubview:promptBox_];
 
   // Prompt text.
   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);
   promptField_.reset(
       [AddTextField(promptBox_, prompt_text, chrome_style::kTextFontStyle)
           retain]);
   MakeTextBold(promptField_, offset, domain.size());
   [promptField_ setFrame:ComputeFrame(
         [promptField_ attributedStringValue], width, 0.0)];
 
   // Set the height of the prompt box from the prompt text, padding, and border.
   CGFloat boxHeight =
       kDialogAlertBarBorderWidth +
       chrome_style::kRowPadding +
       NSHeight([promptField_ frame]) +
       chrome_style::kRowPadding +
       kDialogAlertBarBorderWidth;
   [promptBox_ setFrame:NSMakeRect(0, 0, dialogWidth, boxHeight)];
 
   // Explanation text.
   std::vector<size_t> offsets;
   const base::string16 learn_more_text =
       l10n_util::GetStringUTF16(
           IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE);
   const base::string16 explanation_text =
       l10n_util::GetStringFUTF16(
           offerProfileCreation_ ?
-          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);
   // HyperlinkTextView requires manually inserting the link text
   // into the middle of the message text.  To do this we slice out
   // the "learn more" string from the message so that it can be
   // inserted again.
   const base::string16 explanation_message_text =
     explanation_text.substr(0, offsets[1]) +
     explanation_text.substr(offsets[1] + learn_more_text.size());
   explanationField_.reset(
       [AddTextView([self view], self, explanation_message_text, learn_more_text,
@@ skipping 140 matching lines @@
 
 - (NSButton*)createProfileButton {
   return createProfileButton_.get();
 }
 
 - (NSTextView*)explanationField {
   return explanationField_.get();
 }
 
 @end