Separate RenderViewHost from RenderWidgetHost, part 4: delegate

chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm

Index: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
index f320ff62dac393b6a905a4d2e305ba27683054a4..7d1bbcbe95bede4344e61c4049cd4d3c0e58954e 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
@@ -74,10 +74,11 @@ class SpellCheckObserver : public content::WebContentsObserver {
   self = [super init];
   if (self) {
     renderWidgetHost_ = renderWidgetHost;
-    if (renderWidgetHost_->IsRenderView()) {
+    RenderViewHost* rvh = RenderViewHost::From(renderWidgetHost_);
+    if (rvh) {
       spellingObserver_.reset(
           new ChromeRenderWidgetHostViewMacDelegateInternal::SpellCheckObserver(
-              RenderViewHost::From(renderWidgetHost_), self));
+              rvh, self));
     }
 
     historySwiper_.reset([[HistorySwiper alloc] initWithDelegate:self]);
@@ -137,10 +138,13 @@ class SpellCheckObserver : public content::WebContentsObserver {
 // HistorySwiperDelegate methods
 
 - (BOOL)shouldAllowHistorySwiping {
-  if (!renderWidgetHost_ || !renderWidgetHost_->IsRenderView())
+  if (!renderWidgetHost_)
     return NO;
-  content::WebContents* webContents = content::WebContents::FromRenderViewHost(
-      RenderViewHost::From(renderWidgetHost_));
+  RenderViewHost* renderViewHost = RenderViewHost::From(renderWidgetHost_);
+  if (!renderViewHost)
+    return NO;
+  content::WebContents* webContents =
+      content::WebContents::FromRenderViewHost(renderViewHost);
   if (webContents && DevToolsWindow::IsDevToolsWindow(webContents)) {
     return NO;
   }
@@ -160,7 +164,7 @@ class SpellCheckObserver : public content::WebContentsObserver {
   // this is sub-optimal.
   // TODO(suzhe): Plumb the "can*" methods up from WebCore.
   if (action == @selector(checkSpelling:)) {
-    *valid = renderWidgetHost_->IsRenderView();
+    *valid = RenderViewHost::From(renderWidgetHost_) != nullptr;
     return YES;
   }