Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle.

chrome/browser/prerender/prerender_browsertest.cc

 // 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.
 
 #include <stddef.h>
 #include <deque>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ skipping 558 matching lines @@
 };
 
 // A ContentBrowserClient that forces cross-process navigations.
 class SwapProcessesContentBrowserClient : public ChromeContentBrowserClient {
  public:
   SwapProcessesContentBrowserClient() {}
   ~SwapProcessesContentBrowserClient() override {}
 
   // ChromeContentBrowserClient:
   bool ShouldSwapProcessesForRedirect(
-      content::BrowserContext* browser_context,
+      content::ResourceContext* resource_context,
       const GURL& current_url,
       const GURL& new_url) override {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SwapProcessesContentBrowserClient);
 };
 
 base::FilePath GetTestPath(const std::string& file_name) {
@@ skipping 2786 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   bool display_test_result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
                                                    "DidDisplayReallyPass()",
                                                    &display_test_result));
   ASSERT_TRUE(display_test_result);
 }
 #endif  // !defined(DISABLE_NACL)
 
 }  // namespace prerender