Move ResourceRequestDetails to content/public/browser and put in the content namespace.

BUG=98716
R=jam@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9718017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127454 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 11 deletions

diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 4a044b0..f8381a1 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "content/browser/load_from_memory_cache_details.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
-#include "content/browser/renderer_host/resource_request_details.h"
+#include "content/public/browser/resource_request_details.h"
 #include "content/browser/renderer_host/resource_request_info_impl.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/ssl/ssl_policy.h"
@@ -28,6 +28,8 @@ using content::NavigationController;
 using content::NavigationEntry;
 using content::NavigationEntryImpl;
 using content::ResourceDispatcherHostImpl;
+using content::ResourceRedirectDetails;
+using content::ResourceRequestDetails;
 using content::ResourceRequestInfoImpl;
 using content::SSLStatus;
 using content::WebContents;
@@ -184,11 +186,11 @@ void SSLManager::DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details) {
 
 void SSLManager::DidStartResourceResponse(ResourceRequestDetails* details) {
   scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo(
-      details->url(),
-      details->resource_type(),
-      details->origin_child_id(),
-      details->ssl_cert_id(),
-      details->ssl_cert_status()));
+      details->url,
+      details->resource_type,
+      details->origin_child_id,
+      details->ssl_cert_id,
+      details->ssl_cert_status));
 
   // Notify our policy that we started a resource request.  Ideally, the
   // policy should have the ability to cancel the request, but we can't do
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 668c3e0..a51555d 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -22,17 +22,17 @@
 
 class LoadFromMemoryCacheDetails;
 class NavigationControllerImpl;
-class ResourceRedirectDetails;
-class ResourceRequestDetails;
 class SSLPolicy;
 
 namespace content {
 class NavigationEntryImpl;
+struct ResourceRedirectDetails;
+struct ResourceRequestDetails;
 }
 
 namespace net {
 class SSLInfo;
-}  // namespace net
+}
 
 // The SSLManager SSLManager controls the SSL UI elements in a TabContents.  It
 // listens for various events that influence when these elements should or
@@ -98,8 +98,8 @@ class SSLManager : public content::NotificationObserver {
   // the type we need is in NavigationController which would create a circular
   // header file dependency.
   void DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details);
-  void DidStartResourceResponse(ResourceRequestDetails* details);
-  void DidReceiveResourceRedirect(ResourceRedirectDetails* details);
+  void DidStartResourceResponse(content::ResourceRequestDetails* details);
+  void DidReceiveResourceRedirect(content::ResourceRedirectDetails* details);
   void DidChangeSSLInternalState();
 
   // Update the NavigationEntry with our current state.