Let CRIWVWebView inherit UIView instead of NSObject.

ios/web_view/internal/criwv_web_view.mm

 // Copyright 2014 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_view/internal/criwv_web_view_impl.h"
+#import "ios/web_view/internal/criwv_web_view_internal.h"
 
 #include <memory>
 #include <utility>
 
 #import "base/ios/weak_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
+#import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer.h"
-#import "ios/web/public/navigation_manager.h"
 #import "ios/web/public/web_state/ui/crw_web_delegate.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_delegate_bridge.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 #include "ios/web_view/internal/criwv_browser_state.h"
 #import "ios/web_view/internal/translate/criwv_translate_client.h"
 #import "ios/web_view/public/criwv_web_view_delegate.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
-@interface CRIWVWebViewImpl ()<CRWWebStateDelegate, CRWWebStateObserver> {
+@interface CRIWVWebView ()<CRWWebStateDelegate, CRWWebStateObserver> {
   id<CRIWVWebViewDelegate> _delegate;
   ios_web_view::CRIWVBrowserState* _browserState;
   std::unique_ptr<web::WebState> _webState;
   std::unique_ptr<web::WebStateDelegateBridge> _webStateDelegate;
   std::unique_ptr<web::WebStateObserverBridge> _webStateObserver;
   CGFloat _loadProgress;
 }
 
 @end
 
-@implementation CRIWVWebViewImpl
+@implementation CRIWVWebView
 
 @synthesize delegate = _delegate;
 @synthesize loadProgress = _loadProgress;
 
-- (instancetype)initWithBrowserState:
-    (ios_web_view::CRIWVBrowserState*)browserState {
-  self = [super init];
+- (instancetype)initWithFrame:(CGRect)frame
+                 browserState:(ios_web_view::CRIWVBrowserState*)browserState {
+  self = [super initWithFrame:frame];
   if (self) {
     _browserState = browserState;
 
     web::WebState::CreateParams webStateCreateParams(_browserState);
     _webState = web::WebState::Create(webStateCreateParams);
     _webState->SetWebUsageEnabled(true);
 
     _webStateObserver =
         base::MakeUnique<web::WebStateObserverBridge>(_webState.get(), self);
     _webStateDelegate = base::MakeUnique<web::WebStateDelegateBridge>(self);
     _webState->SetDelegate(_webStateDelegate.get());
 
     // Initialize Translate.
     ios_web_view::CRIWVTranslateClient::CreateForWebState(_webState.get());
   }
   return self;
 }
 
+- (void)willMoveToSuperview:(UIView*)newSuperview {
+  [super willMoveToSuperview:newSuperview];
+  UIView* subview = _webState->GetView();
+  if (subview.superview == self) {
+    return;
+  }
+  subview.frame = self.frame;
+  subview.autoresizingMask =
+      UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+  [self addSubview:subview];
+}
+
 - (UIView*)view {
   return _webState->GetView();
 }
 
 - (BOOL)canGoBack {
   return _webState && _webState->GetNavigationManager()->CanGoBack();
 }
 
 - (BOOL)canGoForward {
   return _webState && _webState->GetNavigationManager()->CanGoForward();
@@ skipping 81 matching lines @@
                     loadSuccess:success];
   }
 }
 
 - (void)webState:(web::WebState*)webState
     didChangeLoadingProgress:(double)progress {
   [self notifyDidUpdateWithChanges:CRIWVWebViewUpdateTypeProgress];
 }
 
 @end