Merge 155443 - Change policy to not trigger dangerous download UI for web intents dispatched files.

content/browser/web_contents/render_view_host_manager.cc

Index: content/browser/web_contents/render_view_host_manager.cc
===================================================================
--- content/browser/web_contents/render_view_host_manager.cc	(revision 156030)
+++ content/browser/web_contents/render_view_host_manager.cc	(working copy)
@@ -56,10 +56,11 @@
   if (pending_render_view_host_)
     CancelPending();
 
-  // We should always have a main RenderViewHost.
+  // We should always have a main RenderViewHost except in some tests.
   RenderViewHostImpl* render_view_host = render_view_host_;
   render_view_host_ = NULL;
-  render_view_host->Shutdown();
+  if (render_view_host)
+    render_view_host->Shutdown();
 
   // Shut down any swapped out RenderViewHosts.
   for (RenderViewHostMap::iterator iter = swapped_out_hosts_.begin();