Move resource_response_info from webkit/ to content/

content/child/npapi/plugin_url_fetcher.cc

 // Copyright (c) 2013 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/child/npapi/plugin_url_fetcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/child/child_thread.h"
 #include "content/child/npapi/plugin_host.h"
 #include "content/child/npapi/plugin_instance.h"
 #include "content/child/npapi/plugin_stream_url.h"
 #include "content/child/npapi/webplugin.h"
 #include "content/child/npapi/webplugin_resource_client.h"
 #include "content/child/plugin_messages.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/request_info.h"
 #include "content/child/resource_dispatcher.h"
 #include "content/child/web_url_loader_impl.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
+#include "content/public/common/resource_response_info.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "webkit/child/multipart_response_delegate.h"
 #include "webkit/child/resource_loader_bridge.h"
-#include "webkit/common/resource_response_info.h"
 
 namespace content {
 namespace {
 
 // This class handles individual multipart responses. It is instantiated when
 // we receive HTTP status code 206 in the HTTP response. This indicates
 // that the response could have multiple parts each separated by a boundary
 // specified in the response header.
 // TODO(jam): this is similar to MultiPartResponseClient in webplugin_impl.cc,
 // we should remove that other class once we switch to loading from the plugin
@@ skipping 145 matching lines @@
     plugin_stream_->DidFail(resource_id_);  // That will delete |this|.
   }
 }
 
 void PluginURLFetcher::OnUploadProgress(uint64 position, uint64 size) {
 }
 
 bool PluginURLFetcher::OnReceivedRedirect(
     const GURL& new_url,
     const GURL& new_first_party_for_cookies,
-    const webkit_glue::ResourceResponseInfo& info) {
+    const ResourceResponseInfo& info) {
   if (!plugin_stream_)
     return false;
 
   // TODO(jam): THIS LOGIC IS COPIED FROM WebPluginImpl::willSendRequest until
   // kDirectNPAPIRequests is the default and we can remove the old path there.
 
   // Currently this check is just to catch an https -> http redirect when
   // loading the main plugin src URL. Longer term, we could investigate
   // firing mixed diplay or scripting issues for subresource loads
   // initiated by plug-ins.
@@ skipping 24 matching lines @@
     }
   } else {
     // Pause the request while we ask the plugin what to do about the redirect.
     bridge_->SetDefersLoading(true);
     plugin_stream_->WillSendRequest(url_, response_code);
   }
 
   return true;
 }
 
-void PluginURLFetcher::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+void PluginURLFetcher::OnReceivedResponse(const ResourceResponseInfo& info) {
   if (!plugin_stream_)
     return;
 
   // TODO(jam): THIS LOGIC IS COPIED FROM WebPluginImpl::didReceiveResponse
   // GetAllHeaders, and GetResponseInfo until kDirectNPAPIRequests is the
   // default and we can remove the old path there.
 
   bool request_is_seekable = true;
   DCHECK(!multipart_delegate_.get());
   if (plugin_stream_->seekable()) {
@@ skipping 121 matching lines @@
   }
 
   if (error_code == net::OK) {
     plugin_stream_->DidFinishLoading(resource_id_);
   } else {
     plugin_stream_->DidFail(resource_id_);
   }
 }
 
 }  // namespace content