Set CRWWebViewContentView's size before resetting scroll proxy.

ios/web/web_state/ui/crw_web_controller_container_view.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/web/web_state/ui/crw_web_controller_container_view.h"
 
 #include "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #import "ios/web/public/web_state/ui/crw_content_view.h"
@@ skipping 142 matching lines @@
 #pragma mark Accessors
 
 - (CRWWebViewContentView*)webViewContentView {
   return _webViewContentView.get();
 }
 
 - (void)setWebViewContentView:(CRWWebViewContentView*)webViewContentView {
   if (![_webViewContentView isEqual:webViewContentView]) {
     [_webViewContentView removeFromSuperview];
     _webViewContentView.reset([webViewContentView retain]);
-    // UIWebViews that are added in |-layoutSubviews| exhbit a scrolling bug, so
-    // they must be added here in the getter (crbug.com/568097).
-    if ([_webViewContentView webViewType] == web::UI_WEB_VIEW_TYPE) {
-      DCHECK(![_webViewContentView superview]);
-      [self addSubview:_webViewContentView];
-    }
+    [_webViewContentView setFrame:self.bounds];
+    [self addSubview:_webViewContentView];
   }
 }
 
 - (id<CRWNativeContent>)nativeController {
   return _nativeController.get();
 }
 
 - (void)setNativeController:(id<CRWNativeContent>)nativeController {
   if (![_nativeController isEqual:nativeController]) {
     base::WeakNSProtocol<id> oldController(_nativeController);
@@ skipping 35 matching lines @@
   CGFloat headerHeight = [_delegate headerHeightForContainerView:self];
   return UIEdgeInsetsInsetRect(self.bounds,
                                UIEdgeInsetsMake(headerHeight, 0, 0, 0));
 }
 
 #pragma mark Layout
 
 - (void)layoutSubviews {
   [super layoutSubviews];
 
-  // WKWebViews added outside of |-layoutSubviews| exhibit a rendering bug that
-  // erroneously scrolls to an arbitrary offset, so add them here
-  // (crbug.com/574996).
-  if (self.webViewContentView.webViewType == web::WK_WEB_VIEW_TYPE &&
-      !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) {
     UIView* nativeView = [self.nativeController view];
     if (!nativeView.superview) {
       [self addSubview:nativeView];
@@ skipping 97 matching lines @@
   else
     self.toolbarContainerView = nil;
 }
 
 - (void)removeAllToolbars {
   // Resetting the property will remove the toolbars from the hierarchy.
   self.toolbarContainerView = nil;
 }
 
 @end