Reorganizes Chromecast code to better reflect functional dependencies.

chromecast/browser/cast_content_browser_client.cc

Index: chromecast/browser/cast_content_browser_client.cc
diff --git a/chromecast/shell/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
similarity index 93%
rename from chromecast/shell/browser/cast_content_browser_client.cc
rename to chromecast/browser/cast_content_browser_client.cc
index ad1ea3f23d6720e9c3f47905e8be4d9fab15eec9..392072bcf39ef4587ce2ad020c1ad196cbf4caa7 100644
--- a/chromecast/shell/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromecast/shell/browser/cast_content_browser_client.h"
+#include "chromecast/browser/cast_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/files/scoped_file.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
+#include "chromecast/browser/cast_browser_context.h"
+#include "chromecast/browser/cast_browser_main_parts.h"
+#include "chromecast/browser/cast_browser_process.h"
+#include "chromecast/browser/cast_network_delegate.h"
+#include "chromecast/browser/devtools/cast_dev_tools_delegate.h"
+#include "chromecast/browser/geolocation/cast_access_token_store.h"
+#include "chromecast/browser/url_request_context_factory.h"
 #include "chromecast/common/cast_paths.h"
 #include "chromecast/common/global_descriptors.h"
-#include "chromecast/shell/browser/cast_browser_context.h"
-#include "chromecast/shell/browser/cast_browser_main_parts.h"
-#include "chromecast/shell/browser/cast_browser_process.h"
-#include "chromecast/shell/browser/cast_network_delegate.h"
-#include "chromecast/shell/browser/devtools/cast_dev_tools_delegate.h"
-#include "chromecast/shell/browser/geolocation/cast_access_token_store.h"
-#include "chromecast/shell/browser/url_request_context_factory.h"
 #include "components/crash/app/breakpad_linux.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
@@ -28,7 +28,7 @@
 #include "net/ssl/ssl_cert_request_info.h"
 
 #if defined(OS_ANDROID)
-#include "chromecast/shell/browser/android/external_video_surface_container_impl.h"
+#include "chromecast/browser/android/external_video_surface_container_impl.h"
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)
@@ -148,7 +148,6 @@ void CastContentBrowserClient::AllowCertificateError(
 void CastContentBrowserClient::SelectClientCertificate(
     int render_process_id,
     int render_view_id,
-    const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const base::Callback<void(net::X509Certificate*)>& callback) {
   GURL requesting_url("https://" + cert_request_info->host_and_port.ToString());