Move Mozilla FTP LIST response parsing code to net/third_party directory.

This should make licensing terms and third-party origin of the code more clear.

TEST=none
BUG=none

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

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

6 files changed, 55 insertions, 18 deletions

diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html
index 23fd40d..bd61783 100644
--- a/chrome/browser/resources/about_credits.html
+++ b/chrome/browser/resources/about_credits.html
@@ -1307,11 +1307,11 @@ Published: October 12, 2006
 <h3>ffmpeg is licensed as follows:</h3>
 <p>FFmpeg is free software; you can redistribute it and/or modify it under the
 terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2.1 of the License, or (at your option) any later 
+Foundation; either version 2.1 of the License, or (at your option) any later
 version.</p>
 <p>FFmpeg is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR 
-A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more 
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
 details.
 </p>
 <p>You should have received a copy of the GNU Lesser General Public License
@@ -1323,5 +1323,41 @@ along with FFmpeg; if not, write to:</p>
 </div>
 </div>
 
+<!-- parseftp -->
+<div class="product">
+<span class="title">parseftp</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://mxr.mozilla.org/mozilla-central/source/netwerk/streamconv/converters/ParseFTPList.h">homepage</a></span>
+<div class="licence">
+<h3>parseftp is licensed as follows:</h3>
+<p>The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.</p>
+<p>The Original Code is mozilla.org Code.</p>
+<p>The Initial Developer of the Original Code is
+Cyrus Patel &lt;cyp@fb14.uni-mainz.de&gt;.
+Portions created by the Initial Developer are Copyright (C) 2002
+the Initial Developer. All Rights Reserved.</p>
+<p>Contributor(s):
+Doug Turner &lt;dougt@netscape.com&gt;</p>
+<p>Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.</p>
+</div>
+</div>
+
 </body>
 </html>
diff --git a/net/net.gyp b/net/net.gyp
index 642489c..376bc1c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -197,8 +197,6 @@
         'ftp/ftp_auth_cache.h',
         'ftp/ftp_ctrl_response_buffer.cc',
         'ftp/ftp_ctrl_response_buffer.h',
-        'ftp/ftp_directory_parser.cc',
-        'ftp/ftp_directory_parser.h',
         'ftp/ftp_network_layer.cc',
         'ftp/ftp_network_layer.h',
         'ftp/ftp_network_session.h',
@@ -321,6 +319,8 @@
         'socket/tcp_client_socket_win.cc',
         'socket/tcp_client_socket_win.h',
         'socket/tcp_pinger.h',
+        'third_party/parseftp/ParseFTPList.cpp',
+        'third_party/parseftp/ParseFTPList.h',
         'url_request/url_request.cc',
         'url_request/url_request.h',
         'url_request/url_request_about_job.cc',
diff --git a/net/ftp/ftp_directory_parser.cc b/net/third_party/parseftp/ParseFTPList.cpp
index 4c2cd04..91da73c 100644
--- a/net/ftp/ftp_directory_parser.cc
+++ b/net/third_party/parseftp/ParseFTPList.cpp
@@ -1,7 +1,3 @@
-// Copyright (c) 2009 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.
-
 // Version: MPL 1.1/GPL 2.0/LGPL 2.1
 //
 // The contents of this file are subject to the Mozilla Public License Version
@@ -39,7 +35,7 @@
 // Derived from:
 // mozilla/netwerk/streamconv/converters/ParseFTPList.cpp revision 1.10
 
-#include "net/ftp/ftp_directory_parser.h"
+#include "net/third_party/parseftp/ParseFTPList.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
diff --git a/net/ftp/ftp_directory_parser.h b/net/third_party/parseftp/ParseFTPList.h
index ff7bc40..341e517 100644
--- a/net/ftp/ftp_directory_parser.h
+++ b/net/third_party/parseftp/ParseFTPList.h
@@ -1,8 +1,5 @@
-// Copyright (c) 2009 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.
-
 // Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
 // The contents of this file are subject to the Mozilla Public License Version
 // 1.1 (the "License"); you may not use this file except in compliance with
 // the License. You may obtain a copy of the License at
@@ -38,8 +35,8 @@
 // mozilla/netwerk/streamconv/converters/ParseFTPList.h revision 1.3
 
 
-#ifndef NET_FTP_FTP_DIRECTORY_PARSER_H_
-#define NET_FTP_FTP_DIRECTORY_PARSER_H_
+#ifndef NET_THIRD_PARTY_PARSEFTP_FTP_DIRECTORY_PARSER_H_
+#define NET_THIRD_PARTY_PARSEFTP_FTP_DIRECTORY_PARSER_H_
 
 #include "base/time.h"
 
@@ -131,4 +128,4 @@ LineType ParseFTPLine(const char *line,
 
 }  // namespace net
 
-#endif  // NET_FTP_FTP_DIRECTORY_PARSER_H_
+#endif  // NET_THIRD_PARTY_PARSEFTP_FTP_DIRECTORY_PARSER_H_
diff --git a/net/third_party/parseftp/README.chromium b/net/third_party/parseftp/README.chromium
new file mode 100644
index 0000000..18feabf69
--- /dev/null
+++ b/net/third_party/parseftp/README.chromium
@@ -0,0 +1,8 @@
+This directory contains Mozilla FTP LIST response parsing routines.
+
+The original code location was mozilla/netwerk/streamconv/converters/ParseFTPList.{cpp,h}
+
+List of changes made to original code:
+  - style adjustment for Chromium
+  - wrapped the routines in net namespace
+  - changed PRExplodedTime to base::Time::Exploded
diff --git a/net/url_request/url_request_new_ftp_job.cc b/net/url_request/url_request_new_ftp_job.cc
index 251602c..a6b5e9f 100644
--- a/net/url_request/url_request_new_ftp_job.cc
+++ b/net/url_request/url_request_new_ftp_job.cc
@@ -12,10 +12,10 @@
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "net/ftp/ftp_directory_parser.h"
 #include "net/ftp/ftp_response_info.h"
 #include "net/ftp/ftp_server_type_histograms.h"
 #include "net/ftp/ftp_transaction_factory.h"
+#include "net/third_party/parseftp/ParseFTPList.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"