Change all callers of WebFileInfo::appendFileRange() to use the new

method.

BUG=none
TEST=none

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

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

3 files changed, 7 insertions, 10 deletions

diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index 8190c2f..835ae78 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -20,7 +20,6 @@
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebData;
-using WebKit::WebFileInfo;
 using WebKit::WebHistoryItem;
 using WebKit::WebHTTPBody;
 using WebKit::WebPoint;
@@ -240,7 +239,7 @@ static void WriteFormData(const WebHTTPBody& http_body, SerializeObject* obj) {
       WriteString(element.filePath, obj);
       WriteInteger64(element.fileStart, obj);
       WriteInteger64(element.fileLength, obj);
-      WriteReal(element.fileInfo.modificationTime, obj);
+      WriteReal(element.modificationTime, obj);
     } else {
       WriteGURL(element.blobURL, obj);
     }
@@ -273,13 +272,14 @@ static WebHTTPBody ReadFormData(const SerializeObject* obj) {
       WebString file_path = ReadString(obj);
       long long file_start = 0;
       long long file_length = -1;
-      WebFileInfo file_info;
+      double modification_time = 0.0;
       if (obj->version >= 8) {
         file_start = ReadInteger64(obj);
         file_length = ReadInteger64(obj);
-        file_info.modificationTime = ReadReal(obj);
+        modification_time = ReadReal(obj);
       }
-      http_body.appendFileRange(file_path, file_start, file_length, file_info);
+      http_body.appendFileRange(file_path, file_start, file_length,
+                                modification_time);
     } else if (obj->version >= 10) {
       GURL blob_url = ReadGURL(obj);
       http_body.appendBlob(blob_url);
diff --git a/webkit/glue/plugins/pepper_url_request_info.cc b/webkit/glue/plugins/pepper_url_request_info.cc
index d5130f2..4edbe83 100644
--- a/webkit/glue/plugins/pepper_url_request_info.cc
+++ b/webkit/glue/plugins/pepper_url_request_info.cc
@@ -22,7 +22,6 @@
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebData;
-using WebKit::WebFileInfo;
 using WebKit::WebHTTPBody;
 using WebKit::WebString;
 using WebKit::WebFrame;
@@ -217,13 +216,11 @@ WebURLRequest URLRequestInfo::ToWebURLRequest(WebFrame* frame) const {
     http_body.initialize();
     for (size_t i = 0; i < body_.size(); ++i) {
       if (body_[i].file_ref) {
-        WebFileInfo file_info;
-        file_info.modificationTime = body_[i].expected_last_modified_time;
         http_body.appendFileRange(
             webkit_glue::FilePathToWebString(body_[i].file_ref->system_path()),
             body_[i].start_offset,
             body_[i].number_of_bytes,
-            file_info);
+            body_[i].expected_last_modified_time);
       } else {
         DCHECK(!body_[i].data.empty());
         http_body.appendData(WebData(body_[i].data));
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index bc239f8..528626e 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -431,7 +431,7 @@ void WebURLLoaderImpl::Context::Start(
                 WebStringToFilePath(element.filePath),
                 static_cast<uint64>(element.fileStart),
                 static_cast<uint64>(element.fileLength),
-                base::Time::FromDoubleT(element.fileInfo.modificationTime));
+                base::Time::FromDoubleT(element.modificationTime));
           }
           break;
         case WebHTTPBody::Element::TypeBlob: