[Signin iOS] Update order of buttons in dialog for merging data

ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm

 // Copyright 2015 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/settings/import_data_collection_view_controller.h"
 
 #import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
@@ skipping 49 matching lines @@
   DCHECK(fromEmail);
   DCHECK(toEmail);
   self = [super initWithStyle:CollectionViewControllerStyleAppBar];
   if (self) {
     _delegate.reset(delegate);
     _fromEmail.reset([fromEmail copy]);
     _toEmail.reset([toEmail copy]);
     _isSignedIn = isSignedIn;
     _shouldClearData = isSignedIn ? SHOULD_CLEAR_DATA_CLEAR_DATA
                                   : SHOULD_CLEAR_DATA_MERGE_DATA;
-    self.title = l10n_util::GetNSString(IDS_IOS_OPTIONS_IMPORT_DATA_TITLE);
     [self setShouldHideDoneButton:YES];
     self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc]
         initWithTitle:l10n_util::GetNSString(
                           IDS_IOS_OPTIONS_IMPORT_DATA_CONTINUE_BUTTON)
                 style:UIBarButtonItemStyleDone
                target:self
                action:@selector(didTapContinue)] autorelease];
     [self loadModel];
   }
   return self;
 }
 
 #pragma mark SettingsRootCollectionViewController
 
 - (void)loadModel {
   [super loadModel];
   CollectionViewModel* model = self.collectionViewModel;
 
   [model addSectionWithIdentifier:SectionIdentifierDisclaimer];
   [model addItem:[self descriptionItem]
       toSectionWithIdentifier:SectionIdentifierDisclaimer];
 
   [model addSectionWithIdentifier:SectionIdentifierOptions];
   _importDataItem.reset([[self importDataItem] retain]);
-  [model addItem:_importDataItem
-      toSectionWithIdentifier:SectionIdentifierOptions];
   _keepDataSeparateItem.reset([[self keepDataSeparateItem] retain]);
-  [model addItem:_keepDataSeparateItem
-      toSectionWithIdentifier:SectionIdentifierOptions];
+  if (_isSignedIn) {
+    [model addItem:_keepDataSeparateItem
+        toSectionWithIdentifier:SectionIdentifierOptions];
+    [model addItem:_importDataItem
+        toSectionWithIdentifier:SectionIdentifierOptions];
+  } else {
+    [model addItem:_importDataItem
+        toSectionWithIdentifier:SectionIdentifierOptions];
+    [model addItem:_keepDataSeparateItem
+        toSectionWithIdentifier:SectionIdentifierOptions];
+  }
 }
 
 #pragma mark Items
 
 - (CollectionViewItem*)descriptionItem {
   CardMultilineItem* item =
       [[[CardMultilineItem alloc] initWithType:ItemTypeFooter] autorelease];
   item.text = l10n_util::GetNSStringF(IDS_IOS_OPTIONS_IMPORT_DATA_HEADER,
                                       base::SysNSStringToUTF16(_fromEmail));
   return item;
@@ skipping 76 matching lines @@
                          : MDCCollectionViewCellAccessoryCheckmark;
   [self reconfigureCellsForItems:@[ _importDataItem, _keepDataSeparateItem ]
          inSectionWithIdentifier:SectionIdentifierOptions];
 }
 
 - (void)didTapContinue {
   [_delegate didChooseClearDataPolicy:self shouldClearData:_shouldClearData];
 }
 
 @end