Adding CRWWebViewContentView as a subview when it is set

ios/web/web_state/ui/crw_web_controller_container_view.mm

Index: ios/web/web_state/ui/crw_web_controller_container_view.mm
diff --git a/ios/web/web_state/ui/crw_web_controller_container_view.mm b/ios/web/web_state/ui/crw_web_controller_container_view.mm
index f0ec9976f9acdb32553c9d0906f50493d6b9b059..76ae57d1d599c383985ff54aa80a663457eeee07 100644
--- a/ios/web/web_state/ui/crw_web_controller_container_view.mm
+++ b/ios/web/web_state/ui/crw_web_controller_container_view.mm
@@ -160,6 +160,10 @@
   if (![_webViewContentView isEqual:webViewContentView]) {
     [_webViewContentView removeFromSuperview];
     _webViewContentView.reset([webViewContentView retain]);
+    if (_webViewContentView) {
+      DCHECK(![_webViewContentView superview]);
+      [self addSubview:_webViewContentView];
+    }
   }
 }
 
@@ -214,13 +218,11 @@
 
 - (void)layoutSubviews {
   [super layoutSubviews];
+  
+  [_webViewContentView setFrame:self.bounds];

[kkhorimoto, 2015/12/16 18:54:17]

Can you use property notation for consistency?  The ivars backing properties
should only really be accessed in accessors (or initializers when setting
default values).

[shreyasv1, 2015/12/16 23:02:05]

Done.

 
-  // webViewcontentView layout.
-  if (self.webViewContentView) {
-    if (!self.webViewContentView.superview)
-      [self addSubview:self.webViewContentView];
-    self.webViewContentView.frame = self.bounds;
-  }
+  // TODO(crbug.com/570114): Move adding of the following subviews to another
+  // place.
 
   // nativeController layout.
   if (self.nativeController) {