Reorganizes Chromecast code to better reflect functional dependencies.

chromecast/browser/cast_content_browser_client.h

 // Copyright 2014 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.
 
-#ifndef CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
-#define CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
+#ifndef CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
+#define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/content_browser_client.h"
 
 namespace chromecast {
 namespace shell {
 
 class CastBrowserMainParts;
 class URLRequestContextFactory;
@@ skipping 29 matching lines @@
       const GURL& request_url,
       content::ResourceType resource_type,
       bool overridable,
       bool strict_enforcement,
       bool expired_previous_decision,
       const base::Callback<void(bool)>& callback,
       content::CertificateRequestResultType* result) override;
   virtual void SelectClientCertificate(
       int render_process_id,
       int render_frame_id,
-      const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
       const base::Callback<void(net::X509Certificate*)>& callback) override;
   virtual bool CanCreateWindow(
       const GURL& opener_url,
       const GURL& opener_top_level_frame_url,
       const GURL& source_origin,
       WindowContainerType container_type,
       const GURL& target_url,
       const content::Referrer& referrer,
       WindowOpenDisposition disposition,
@@ skipping 21 matching lines @@
       GURL requesting_url);
 
   scoped_ptr<URLRequestContextFactory> url_request_context_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
 };
 
 }  // namespace shell
 }  // namespace chromecast
 
-#endif  // CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
+#endif  // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_