Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/public/browser/content_browser_client.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 "content/public/browser/content_browser_client.h"
 
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "build/build_config.h"
 #include "content/public/browser/client_certificate_delegate.h"
@@ skipping 90 matching lines @@
 media::ScopedAudioManagerPtr ContentBrowserClient::CreateAudioManager(
     media::AudioLogFactory* audio_log_factory) {
   return nullptr;
 }
 
 std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() {
   return nullptr;
 }
 
 bool ContentBrowserClient::ShouldSwapProcessesForRedirect(
-    ResourceContext* resource_context, const GURL& current_url,
+    BrowserContext* browser_context, const GURL& current_url,

[nasko, 2016/09/08 00:35:36]

nit: Each parameter on new line.

[clamy, 2016/09/09 15:06:41]

Done.

     const GURL& new_url) {
   return false;
 }
 
 bool ContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) {
   return true;
 }
 
 std::string ContentBrowserClient::GetCanonicalEncodingNameByAliasName(
     const std::string& alias_name) {
@@ skipping 300 matching lines @@
 #if defined(VIDEO_HOLE)
 ExternalVideoSurfaceContainer*
 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
     WebContents* web_contents) {
   NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348.";
   return nullptr;
 }
 #endif
 
 }  // namespace content