[ios clean] Rename removeChildViewController -> detachChildViewController

ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm

 // Copyright 2016 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.
 
 // ======                        New Architecture                         =====
 // =         This code is only used in the new iOS Chrome architecture.       =
 // ============================================================================
 
 #import "ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.h"
 
@@ skipping 18 matching lines @@
 @property(nonatomic, strong) Constraints* contentConstraintsWithStrip;
 @property(nonatomic, strong) Constraints* contentConstraintsWithoutStrip;
 @property(nonatomic, strong) Constraints* stripConstraints;
 
 // Cache for forwarding methods to child view controllers.
 @property(nonatomic, assign) SEL actionToForward;
 @property(nonatomic, weak) UIResponder* forwardingTarget;
 
 @property(nonatomic, strong) NSLayoutConstraint* stripHeightConstraint;
 
-// Contained view controller utility methods.
-- (void)removeChildViewController:(UIViewController*)viewController;
+// Contained view controller utility methods. This method cannot be named
+//-removeChildViewController:, as that is a private superclass method.
+- (void)detachChildViewController:(UIViewController*)viewController;
 
 // Called after a new content view controller is set, but before
 // |-didMoveToParentViewController:| is called on that view controller.
 - (void)didAddContentViewController;
 
 // Called after a new strip view controller is set, but before
 // |-didMoveToParentViewController:| is called on that view controller.
 - (void)didAddTabStripViewController;
 
 // Methods to populate the constraint properties.
@@ skipping 18 matching lines @@
 #pragma mark - Public properties
 
 - (void)setContentViewController:(UIViewController*)contentViewController {
   if (self.contentViewController == contentViewController)
     return;
 
   // Remove the current content view controller, if any.
   [NSLayoutConstraint
       deactivateConstraints:self.contentConstraintsWithoutStrip];
   [NSLayoutConstraint deactivateConstraints:self.contentConstraintsWithStrip];
-  [self removeChildViewController:self.contentViewController];
+  [self detachChildViewController:self.contentViewController];
 
   // Add the new content view controller.
   [self addChildViewController:contentViewController];
   contentViewController.view.translatesAutoresizingMaskIntoConstraints = NO;
   [self.view addSubview:contentViewController.view];
   _contentViewController = contentViewController;
   [self didAddContentViewController];
   [self.view setNeedsUpdateConstraints];
   [self.contentViewController didMoveToParentViewController:self];
 }
 
 - (void)setTabStripViewController:(UIViewController*)tabStripViewController {
   if (self.tabStripViewController == tabStripViewController)
     return;
 
   // Remove the current strip view controller, if any.
   [NSLayoutConstraint deactivateConstraints:self.stripConstraints];
   [NSLayoutConstraint deactivateConstraints:self.contentConstraintsWithStrip];
-  [self removeChildViewController:self.tabStripViewController];
+  [self detachChildViewController:self.tabStripViewController];
 
   // Add the new strip view controller.
   [self addChildViewController:tabStripViewController];
   tabStripViewController.view.translatesAutoresizingMaskIntoConstraints = NO;
   [self.view addSubview:tabStripViewController.view];
   _tabStripViewController = tabStripViewController;
   [self didAddTabStripViewController];
   [self.view setNeedsUpdateConstraints];
   [self.tabStripViewController didMoveToParentViewController:self];
 }
@@ skipping 96 matching lines @@
           conformsToProtocol:@protocol(ZoomTransitionDelegate)]) {
     return [reinterpret_cast<id<ZoomTransitionDelegate>>(
         self.contentViewController) rectForZoomWithKey:key
                                                 inView:view];
   }
   return CGRectNull;
 }
 
 #pragma mark - Private methods
 
-- (void)removeChildViewController:(UIViewController*)viewController {
+- (void)detachChildViewController:(UIViewController*)viewController {
   if (viewController.parentViewController != self)
     return;
   [viewController willMoveToParentViewController:nil];
   [viewController.view removeFromSuperview];
   [viewController removeFromParentViewController];
 }
 
 - (void)didAddContentViewController {
   if (self.tabStripViewController) {
     [self updateContentConstraintsWithStrip];
@@ skipping 42 matching lines @@
       [stripView.heightAnchor constraintEqualToConstant:0.0];
   self.stripConstraints = @[
     [stripView.topAnchor constraintEqualToAnchor:self.view.topAnchor],
     [stripView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
     [stripView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor],
     self.stripHeightConstraint,
   ];
 }
 
 @end