Don't swap out the old RenderFrameHost until the new one commits.

content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
@@ skipping 408 matching lines @@
       'browser/cert_store_impl.cc',
       'browser/cert_store_impl.h',
       'browser/child_process_launcher.cc',
       'browser/child_process_launcher.h',
       'browser/child_process_security_policy_impl.cc',
       'browser/child_process_security_policy_impl.h',
       'browser/cocoa/system_hotkey_helper_mac.h',
       'browser/cocoa/system_hotkey_helper_mac.mm',
       'browser/cocoa/system_hotkey_map.h',
       'browser/cocoa/system_hotkey_map.mm',
-      'browser/cross_site_request_manager.cc',
-      'browser/cross_site_request_manager.h',
       'browser/devtools/devtools_agent_host_impl.cc',
       'browser/devtools/devtools_agent_host_impl.h',
       'browser/devtools/devtools_browser_target.cc',
       'browser/devtools/devtools_browser_target.h',
       'browser/devtools/devtools_frontend_host_impl.cc',
       'browser/devtools/devtools_frontend_host_impl.h',
       'browser/devtools/devtools_http_handler_impl.cc',
       'browser/devtools/devtools_http_handler_impl.h',
       'browser/devtools/devtools_manager_impl.cc',
       'browser/devtools/devtools_manager_impl.h',
@@ skipping 686 matching lines @@
       'browser/screen_orientation/screen_orientation_provider_android.cc',
       'browser/service_worker/embedded_worker_instance.cc',
       'browser/service_worker/embedded_worker_instance.h',
       'browser/service_worker/embedded_worker_registry.cc',
       'browser/service_worker/embedded_worker_registry.h',
       'browser/service_worker/service_worker_cache.cc',
       'browser/service_worker/service_worker_cache.h',
       'browser/service_worker/service_worker_cache_listener.cc',
       'browser/service_worker/service_worker_cache_listener.h',
       'browser/service_worker/service_worker_cache_storage.cc',
-      'browser/service_worker/service_worker_cache_storage.h',      
+      'browser/service_worker/service_worker_cache_storage.h',
       'browser/service_worker/service_worker_cache_storage_manager.cc',
-      'browser/service_worker/service_worker_cache_storage_manager.h',      
+      'browser/service_worker/service_worker_cache_storage_manager.h',
       'browser/service_worker/service_worker_context_core.cc',
       'browser/service_worker/service_worker_context_core.h',
       'browser/service_worker/service_worker_context_observer.h',
       'browser/service_worker/service_worker_context_request_handler.cc',
       'browser/service_worker/service_worker_context_request_handler.h',
       'browser/service_worker/service_worker_context_wrapper.cc',
       'browser/service_worker/service_worker_context_wrapper.h',
       'browser/service_worker/service_worker_controllee_request_handler.cc',
       'browser/service_worker/service_worker_controllee_request_handler.h',
       'browser/service_worker/service_worker_database.cc',
@@ skipping 723 matching lines @@
       'sources': [
         'browser/media/cdm/browser_cdm_manager.cc',
         'browser/media/cdm/browser_cdm_manager.h',
         # This works on Android because enable_browser_cdms==1 on Android.
         'browser/media/media_web_contents_observer.cc',
         'browser/media/media_web_contents_observer.h',
       ],
     }],
   ],
 }