Merge 182894

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
===================================================================
--- chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(revision 183646)
+++ chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(working copy)
@@ -56,6 +56,7 @@
 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
 #endif
 
+#include "chrome/browser/chromeos/login/merge_session_throttle.h"
 // TODO(oshima): Enable this for other platforms.
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/renderer_host/offline_resource_throttle.h"
@@ -160,6 +161,11 @@
     // block unsafe site after we remove offline page.
     throttles->push_back(new OfflineResourceThrottle(
         child_id, route_id, request, appcache_service));
+    // Add interstitial page while merge session process (cookie
+    // reconstruction from OAuth2 refresh token in ChromeOS login) is still in
+    // progress while we are attempting to load a google property.
+    throttles->push_back(new MergeSessionThrottle(
+        child_id, route_id, request));
   }
 #endif