Remove some unnecessary NULL checks of RenderFrameHost before calling WebContents::FromRenderFrameHost.

BUG=304341
R=nasko@chromium.org

Review URL: https://codereview.chromium.org/134503005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246334 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 2 insertions, 32 deletions

diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc
index 10d2c6c..4e31f71 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.cc
+++ b/android_webview/browser/aw_contents_client_bridge_base.cc
@@ -60,7 +60,6 @@ AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromID(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  if (!rfh) return NULL;
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(rfh);
   return UserData::GetContents(web_contents);
diff --git a/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc
index 5656b91..90eafbe 100644
--- a/android_webview/browser/aw_login_delegate.cc
+++ b/android_webview/browser/aw_login_delegate.cc
@@ -89,11 +89,6 @@ void AwLoginDelegate::HandleHttpAuthRequestOnUIThread(
 
   RenderFrameHost* render_frame_host = RenderFrameHost::FromID(
       render_process_id_, render_frame_id_);
-  if (!render_frame_host) {
-    Cancel();
-    return;
-  }
-
   WebContents* web_contents = WebContents::FromRenderFrameHost(
       render_frame_host);
   if (!aw_http_auth_handler_->HandleOnUIThread(web_contents)) {
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 39b3b57..94a6ae7 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1783,10 +1783,6 @@ void ChromeContentBrowserClient::AllowCertificateError(
   // If the tab is being prerendered, cancel the prerender and the request.
   content::RenderFrameHost* render_frame_host =
       content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  if (!render_frame_host) {
-    NOTREACHED();
-    return;
-  }
   WebContents* tab = WebContents::FromRenderFrameHost(render_frame_host);
   if (!tab) {
     NOTREACHED();
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 8403054..a7224a5 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -105,9 +105,6 @@ TabSpecificContentSettings* TabSpecificContentSettings::GetForFrame(
 
   content::RenderFrameHost* frame = content::RenderFrameHost::FromID(
       render_process_id, render_frame_id);
-  if (!frame)
-    return NULL;
-
   WebContents* web_contents = WebContents::FromRenderFrameHost(frame);
   if (!web_contents)
     return NULL;
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index bd85abe..8de90f5 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -1864,9 +1864,6 @@ void PrerenderManager::RecordCookieEvent(int process_id,
                                          PrerenderContents::CookieEvent event,
                                          const net::CookieList* cookie_list) {
   RenderFrameHost* rfh = RenderFrameHost::FromID(process_id, frame_id);
-  if (!rfh)
-    return;
-
   WebContents* web_contents = WebContents::FromRenderFrameHost(rfh);
   if (!web_contents)
     return;
diff --git a/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc
index 351b9262..d3d3154 100644
--- a/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc
@@ -161,8 +161,6 @@ void PepperExtensionsCommonMessageFilter::EnsureDispatcherOwnerInitialized() {
   DCHECK(!dispatcher_owner_);
   content::RenderFrameHost* frame_host = content::RenderFrameHost::FromID(
       render_process_id_, render_frame_id_);
-  if (!frame_host)
-    return;
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(frame_host);
 
diff --git a/chrome/browser/search/iframe_source.cc b/chrome/browser/search/iframe_source.cc
index 2856385..26250d3 100644
--- a/chrome/browser/search/iframe_source.cc
+++ b/chrome/browser/search/iframe_source.cc
@@ -56,8 +56,6 @@ bool IframeSource::GetOrigin(
     std::string* origin) const {
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id, render_frame_id);
-  if (rfh == NULL)
-    return false;
   content::WebContents* contents =
       content::WebContents::FromRenderFrameHost(rfh);
   if (contents == NULL)
diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc
index 393fce0c..cc77c59 100644
--- a/chrome/browser/ui/login/login_prompt.cc
+++ b/chrome/browser/ui/login/login_prompt.cc
@@ -126,8 +126,6 @@ WebContents* LoginHandler::GetWebContentsForLogin() const {
 
   content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
       render_process_host_id_, render_frame_id_);
-  if (!rfh)
-    return NULL;
   return WebContents::FromRenderFrameHost(rfh);
 }
 
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 1356450..8083102 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -282,9 +282,6 @@ void NotifyRedirectOnUI(int render_process_id,
                         scoped_ptr<ResourceRedirectDetails> details) {
   RenderFrameHostImpl* host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host);
-  if (!host)
-    return;
-
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(WebContents::FromRenderFrameHost(host));
   if (!web_contents)
@@ -298,9 +295,6 @@ void NotifyResponseOnUI(int render_process_id,
                         scoped_ptr<ResourceRequestDetails> details) {
   RenderFrameHostImpl* host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host);
-  if (!host)
-    return;
-
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(WebContents::FromRenderFrameHost(host));
   if (!web_contents)
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index ed4c2ac..6d120a9 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/content/browser/ssl/ssl_error_handler.cc
@@ -63,8 +63,7 @@ void SSLErrorHandler::Dispatch() {
   WebContents* web_contents = NULL;
   RenderFrameHost* render_frame_host =
       RenderFrameHost::FromID(render_process_id_, render_frame_id_);
-  if (render_frame_host)
-    web_contents = WebContents::FromRenderFrameHost(render_frame_host);
+  web_contents = WebContents::FromRenderFrameHost(render_frame_host);
 
   if (!web_contents) {
     // We arrived on the UI thread, but the tab we're looking for is no longer
diff --git a/content/shell/browser/shell_login_dialog_gtk.cc b/content/shell/browser/shell_login_dialog_gtk.cc
index bf24361..7ac1f58 100644
--- a/content/shell/browser/shell_login_dialog_gtk.cc
+++ b/content/shell/browser/shell_login_dialog_gtk.cc
@@ -32,8 +32,7 @@ void ShellLoginDialog::PlatformCreateDialog(const base::string16& message) {
   WebContents* web_contents = NULL;
   RenderFrameHost* render_frame_host =
       RenderFrameHost::FromID(render_process_id, render_frame_id);
-  if (render_frame_host)
-    web_contents = WebContents::FromRenderFrameHost(render_frame_host);
+  web_contents = WebContents::FromRenderFrameHost(render_frame_host);
   DCHECK(web_contents);
 
   gfx::NativeWindow parent_window =