[iOS] Upstream //ios/chrome/browser/ui/commands changes

ios/chrome/browser/ui/commands/show_mail_composer_command.mm

 // Copyright 2012 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 "ios/chrome/browser/ui/commands/show_mail_composer_command.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 
 @implementation ShowMailComposerCommand {
   base::scoped_nsobject<NSArray> _toRecipients;
   base::scoped_nsobject<NSString> _subject;
   base::scoped_nsobject<NSString> _body;
   base::FilePath _textFileToAttach;
-  // Alert message ids for the case when no email account is configured.
-  int _emailNotConfiguredAlertTitleId;
-  int _emailNotConfiguredAlertMessageId;
 }
 
-@synthesize textFileToAttach;
+@synthesize emailNotConfiguredAlertTitleId = _emailNotConfiguredAlertTitleId;
+@synthesize emailNotConfiguredAlertMessageId =
+    _emailNotConfiguredAlertMessageId;
 
-- (id)initWithToRecipient:(NSString*)toRecipient
+- (instancetype)initWithTag:(NSInteger)tag {
+  NOTREACHED();
+  return nil;
+}
+
+- (instancetype)initWithToRecipient:(NSString*)toRecipient
                              subject:(NSString*)subject
                                 body:(NSString*)body
       emailNotConfiguredAlertTitleId:(int)alertTitleId
     emailNotConfiguredAlertMessageId:(int)alertMessageId {
   DCHECK(alertTitleId);
   DCHECK(alertMessageId);
-  self = [super init];
+  self = [super initWithTag:IDC_SHOW_MAIL_COMPOSER];
   if (self) {
-    self.tag = IDC_SHOW_MAIL_COMPOSER;
     _toRecipients.reset([@[ toRecipient ] retain]);
-    _subject.reset([subject retain]);
-    _body.reset([body retain]);
+    _subject.reset([subject copy]);
+    _body.reset([body copy]);
     _emailNotConfiguredAlertTitleId = alertTitleId;
     _emailNotConfiguredAlertMessageId = alertMessageId;
   }
   return self;
 }
 
 - (NSArray*)toRecipients {
   return _toRecipients.get();
 }
 
 - (NSString*)subject {
   return _subject.get();
 }
 
 - (NSString*)body {
   return _body.get();
 }
 
-- (int)emailNotConfiguredAlertTitleId {
-  return _emailNotConfiguredAlertTitleId;
+- (const base::FilePath&)textFileToAttach {
+  return _textFileToAttach;
 }
 
-- (int)emailNotConfiguredAlertMessageId {
-  return _emailNotConfiguredAlertMessageId;
+- (void)setTextFileToAttach:(const base::FilePath&)textFileToAttach {
+  _textFileToAttach = textFileToAttach;
 }
 
 @end