Don't dismiss Settings when another view controller is presented on top

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

 // 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.
 
 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
 
 #include "base/ios/ios_util.h"
 #import "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
@@ skipping 524 matching lines @@
       NOTREACHED()
           << "Unexpected command " << [sender tag]
           << " Settings commands must execute on the main browser state.";
   }
   [[self nextResponder] chromeExecuteCommand:sender];
 }
 
 #pragma mark - UIResponder
 
 - (NSArray*)keyCommands {
+  if ([self presentedViewController]) {

[gambard, 2017/02/24 12:33:28]

Are you sure this is reset to nil when the presented view controller is
dismissed?
Maybe we should add an EG test?

[lpromero, 2017/02/27 16:55:52]

Done. (Yes the property is correctly updated.)

+    return nil;
+  }
   base::WeakNSObject<SettingsNavigationController> weakSelf(self);
   return @[
     [UIKeyCommand cr_keyCommandWithInput:UIKeyInputEscape
                            modifierFlags:Cr_UIKeyModifierNone
                                    title:nil
                                   action:^{
                                     [weakSelf closeSettings];
                                   }],
   ];
 }
@@ skipping 95 matching lines @@
   NSValue* key = [self keyForController:controller];
   return [appBarContainedViewControllers_ objectForKey:key];
 }
 
 // Returns the dictionary key to use when dealing with |controller|.
 - (NSValue*)keyForController:(UIViewController*)controller {
   return [NSValue valueWithPointer:controller];
 }
 
 @end