FBTF: Move some structs in webkit_glue::ResourceLoaderBridge:: .

This moves inner structs into the namespace toplevel so we can foreward declare
them; then we forward declare them in render_messages.h so we can drop that
header.

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/3616014

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

6 files changed, 16 insertions, 16 deletions

diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index f4aad57..4feb0e6 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -235,7 +235,7 @@ void BufferedResourceLoader::SetAllowDefer(bool is_allowed) {
 //     webkit_glue::ResourceLoaderBridge::Peer implementations
 bool BufferedResourceLoader::OnReceivedRedirect(
     const GURL& new_url,
-    const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+    const webkit_glue::ResourceResponseInfo& info,
     bool* has_new_first_party_for_cookies,
     GURL* new_first_party_for_cookies) {
   DCHECK(bridge_.get());
@@ -259,7 +259,7 @@ bool BufferedResourceLoader::OnReceivedRedirect(
 }
 
 void BufferedResourceLoader::OnReceivedResponse(
-    const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+    const webkit_glue::ResourceResponseInfo& info,
     bool content_filtered) {
   DCHECK(bridge_.get());
 
@@ -479,7 +479,7 @@ void BufferedResourceLoader::ReadInternal() {
 }
 
 bool BufferedResourceLoader::VerifyPartialResponse(
-    const ResourceLoaderBridge::ResponseInfo& info) {
+    const ResourceResponseInfo& info) {
   int64 first_byte_position, last_byte_position, instance_size;
   if (!info.headers->GetContentRange(&first_byte_position,
                                      &last_byte_position,
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
index b520418..d07eb01 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/glue/media/buffered_data_source.h
@@ -110,11 +110,11 @@ class BufferedResourceLoader :
   virtual void OnUploadProgress(uint64 position, uint64 size) {}
   virtual bool OnReceivedRedirect(
       const GURL& new_url,
-      const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+      const webkit_glue::ResourceResponseInfo& info,
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies);
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+      const webkit_glue::ResourceResponseInfo& info,
       bool content_filtered);
   virtual void OnDownloadedData(int len) {}
   virtual void OnReceivedData(const char* data, int len);
@@ -150,7 +150,7 @@ class BufferedResourceLoader :
   void ReadInternal();
 
   // If we have made a range request, verify the response from the server.
-  bool VerifyPartialResponse(const ResourceLoaderBridge::ResponseInfo& info);
+  bool VerifyPartialResponse(const ResourceResponseInfo& info);
 
   // Done with read. Invokes the read callback and reset parameters for the
   // read request.
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index 7254c92..2ba0087 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -99,7 +99,7 @@ class BufferedResourceLoaderTest : public testing::Test {
 
   void FullResponse(int64 instance_size) {
     EXPECT_CALL(*this, StartCallback(net::OK));
-    ResourceLoaderBridge::ResponseInfo info;
+    ResourceResponseInfo info;
     std::string header = base::StringPrintf("HTTP/1.1 200 OK\n"
                                             "Content-Length: %" PRId64,
                                             instance_size);
@@ -116,7 +116,7 @@ class BufferedResourceLoaderTest : public testing::Test {
                        int64 instance_size) {
     EXPECT_CALL(*this, StartCallback(net::OK));
     int64 content_length = last_position - first_position + 1;
-    ResourceLoaderBridge::ResponseInfo info;
+    ResourceResponseInfo info;
     std::string header = base::StringPrintf("HTTP/1.1 206 Partial Content\n"
                                             "Content-Range: bytes "
                                             "%" PRId64 "-%" PRId64 "/%" PRId64,
@@ -213,7 +213,7 @@ TEST_F(BufferedResourceLoaderTest, MissingHttpHeader) {
   EXPECT_CALL(*bridge_, OnDestroy())
       .WillOnce(Invoke(this, &BufferedResourceLoaderTest::ReleaseBridge));
 
-  ResourceLoaderBridge::ResponseInfo info;
+  ResourceResponseInfo info;
   loader_->OnReceivedResponse(info, false);
 }
 
@@ -228,7 +228,7 @@ TEST_F(BufferedResourceLoaderTest, BadHttpResponse) {
   EXPECT_CALL(*bridge_, OnDestroy())
       .WillOnce(Invoke(this, &BufferedResourceLoaderTest::ReleaseBridge));
 
-  ResourceLoaderBridge::ResponseInfo info;
+  ResourceResponseInfo info;
   info.headers = new net::HttpResponseHeaders("HTTP/1.1 404 Not Found\n");
   loader_->OnReceivedResponse(info, false);
 }
@@ -268,7 +268,7 @@ TEST_F(BufferedResourceLoaderTest, InvalidPartialResponse) {
   EXPECT_CALL(*bridge_, OnDestroy())
       .WillOnce(Invoke(this, &BufferedResourceLoaderTest::ReleaseBridge));
 
-  ResourceLoaderBridge::ResponseInfo info;
+  ResourceResponseInfo info;
   std::string header = base::StringPrintf("HTTP/1.1 206 Partial Content\n"
                                           "Content-Range: bytes %d-%d/%d",
                                           1, 10, 1024);
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
index 56deaeb..0b09edf 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/glue/media/simple_data_source.cc
@@ -122,7 +122,7 @@ bool SimpleDataSource::IsStreaming() {
 
 bool SimpleDataSource::OnReceivedRedirect(
     const GURL& new_url,
-    const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+    const webkit_glue::ResourceResponseInfo& info,
     bool* has_new_first_party_for_cookies,
     GURL* new_first_party_for_cookies) {
   SetURL(new_url);
@@ -132,7 +132,7 @@ bool SimpleDataSource::OnReceivedRedirect(
 }
 
 void SimpleDataSource::OnReceivedResponse(
-    const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+    const webkit_glue::ResourceResponseInfo& info,
     bool content_filtered) {
   size_ = info.content_length;
 }
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h
index d238f61..d649c0d 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/glue/media/simple_data_source.h
@@ -54,11 +54,11 @@ class SimpleDataSource : public media::DataSource,
   virtual void OnUploadProgress(uint64 position, uint64 size) {}
   virtual bool OnReceivedRedirect(
       const GURL& new_url,
-      const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+      const webkit_glue::ResourceResponseInfo& info,
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies);
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
+      const webkit_glue::ResourceResponseInfo& info,
       bool content_filtered);
   virtual void OnDownloadedData(int len) {}
   virtual void OnReceivedData(const char* data, int len);
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index d05bb72..50c8910 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/glue/media/simple_data_source_unittest.cc
@@ -81,7 +81,7 @@ class SimpleDataSourceTest : public testing::Test {
   }
 
   void RequestSucceeded(bool is_loaded) {
-    ResourceLoaderBridge::ResponseInfo info;
+    ResourceResponseInfo info;
     info.content_length = kDataSize;
 
     data_source_->OnReceivedResponse(info, false);