net: Add namespace net to URLRequestFileDirJob.

net: Add namespace net to URLRequestFileDirJob.

BUG=64263
TEST=compiled locally and trybots

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70291

[tfarina, 2010-12-27 02:06:35]

Please, take a look.

[willchan no longer on Chromium, 2010-12-29 23:11:09]

LGTM

On Sun, Dec 26, 2010 at 6:06 PM, <tfarina@chromium.org> wrote:

> Reviewers: willchan, wtc,
>
> Message:
> Please, take a look.
>
> Description:
> net: Add namespace net to URLRequestFileDirJob.
>
> BUG=64263
> TEST=compiled locally and trybots
>
> Please review this at http://codereview.chromium.org/5958008/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M net/url_request/url_request_file_dir_job.h
>  M net/url_request/url_request_file_dir_job.cc
>
>
> Index: net/url_request/url_request_file_dir_job.cc
> diff --git a/net/url_request/url_request_file_dir_job.cc
> b/net/url_request/url_request_file_dir_job.cc
> index
>
553add8ee6c1e9eaa91881cb68d4e2c648e69a10..badb6b8776ac1e84a9a69390ad67a59eaa182d2c
> 100644
> --- a/net/url_request/url_request_file_dir_job.cc
> +++ b/net/url_request/url_request_file_dir_job.cc
> @@ -1,4 +1,4 @@
> -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
> +// Copyright (c) 2010 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.
>
> @@ -19,11 +19,11 @@
>  #include <sys/stat.h>
>  #endif
>
> -using std::string;
> +namespace net {
>
> -URLRequestFileDirJob::URLRequestFileDirJob(net::URLRequest* request,
> +URLRequestFileDirJob::URLRequestFileDirJob(URLRequest* request,
>                                            const FilePath& dir_path)
> -    : net::URLRequestJob(request),
> +    : URLRequestJob(request),
>       dir_path_(dir_path),
>       canceled_(false),
>       list_complete_(false),
> @@ -57,7 +57,7 @@ void URLRequestFileDirJob::StartAsync() {
>   // is trying to feed us data.
>
>   AddRef();
> -  lister_ = new net::DirectoryLister(dir_path_, this);
> +  lister_ = new DirectoryLister(dir_path_, this);
>   lister_->Start();
>
>   NotifyHeadersComplete();
> @@ -69,18 +69,18 @@ void URLRequestFileDirJob::Kill() {
>
>   canceled_ = true;
>
> -  // Don't call CloseLister or dispatch an error to the net::URLRequest
> because
> +  // Don't call CloseLister or dispatch an error to the URLRequest because
>   // we want OnListDone to be called to also write the error to the output
> -  // stream. OnListDone will notify the net::URLRequest at this time.
> +  // stream. OnListDone will notify the URLRequest at this time.
>   if (lister_)
>     lister_->Cancel();
>
> -  net::URLRequestJob::Kill();
> +  URLRequestJob::Kill();
>
>   method_factory_.RevokeAll();
>  }
>
> -bool URLRequestFileDirJob::ReadRawData(net::IOBuffer* buf, int buf_size,
> +bool URLRequestFileDirJob::ReadRawData(IOBuffer* buf, int buf_size,
>                                        int *bytes_read) {
>   DCHECK(bytes_read);
>   *bytes_read = 0;
> @@ -99,19 +99,19 @@ bool URLRequestFileDirJob::ReadRawData(net::IOBuffer*
> buf, int buf_size,
>   return false;
>  }
>
> -bool URLRequestFileDirJob::GetMimeType(string* mime_type) const {
> +bool URLRequestFileDirJob::GetMimeType(std::string* mime_type) const {
>   *mime_type = "text/html";
>   return true;
>  }
>
> -bool URLRequestFileDirJob::GetCharset(string* charset) {
> +bool URLRequestFileDirJob::GetCharset(std::string* charset) {
>   // All the filenames are converted to UTF-8 before being added.
>   *charset = "utf-8";
>   return true;
>  }
>
>  void URLRequestFileDirJob::OnListFile(
> -    const net::DirectoryLister::DirectoryListerData& data) {
> +    const DirectoryLister::DirectoryListerData& data) {
>   // We wait to write out the header until we get the first file, so that
> we
>   // can catch errors from DirectoryLister and show an error page.
>   if (!wrote_header_) {
> @@ -126,7 +126,7 @@ void URLRequestFileDirJob::OnListFile(
>     const string16& title = WideToUTF16(
>         base::SysNativeMBToWide(dir_path_.value()));
>  #endif
> -    data_.append(net::GetDirectoryListingHeader(title));
> +    data_.append(GetDirectoryListingHeader(title));
>     wrote_header_ = true;
>   }
>
> @@ -137,7 +137,7 @@ void URLRequestFileDirJob::OnListFile(
>   // Note that we should not convert ftLastWriteTime to the local time
> because
>   // ICU's datetime formatting APIs expect time in UTC and take into
> account
>   // the timezone before formatting.
> -  data_.append(net::GetDirectoryListingEntry(
> +  data_.append(GetDirectoryListingEntry(
>       data.info.cFileName, std::string(),
>       (data.info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? true :
> false,
>       size,
> @@ -145,7 +145,7 @@ void URLRequestFileDirJob::OnListFile(
>
>  #elif defined(OS_POSIX)
>   // TOOD(jungshik): The same issue as for the directory name.
> -  data_.append(net::GetDirectoryListingEntry(
> +  data_.append(GetDirectoryListingEntry(
>       WideToUTF16(base::SysNativeMBToWide(data.info.filename)),
>       data.info.filename,
>       S_ISDIR(data.info.stat.st_mode),
> @@ -220,3 +220,5 @@ void URLRequestFileDirJob::CompleteRead() {
>     }
>   }
>  }
> +
> +}  // namespace net
> Index: net/url_request/url_request_file_dir_job.h
> diff --git a/net/url_request/url_request_file_dir_job.h
> b/net/url_request/url_request_file_dir_job.h
> index
>
bdb9b375481ab0825f73c48a450dd506d5cc5ead..2b40a98f668a6bab3dc6856fa60b98f495cf2e5e
> 100644
> --- a/net/url_request/url_request_file_dir_job.h
> +++ b/net/url_request/url_request_file_dir_job.h
> @@ -2,8 +2,8 @@
>  // Use of this source code is governed by a BSD-style license that can be
>  // found in the LICENSE file.
>
> -#ifndef NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H__
> -#define NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H__
> +#ifndef NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H_
> +#define NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H_
>  #pragma once
>
>  #include <string>
> @@ -14,23 +14,25 @@
>  #include "net/base/directory_lister.h"
>  #include "net/url_request/url_request_job.h"
>
> +namespace net {
> +
>  class URLRequestFileDirJob
> -  : public net::URLRequestJob,
> -    public net::DirectoryLister::DirectoryListerDelegate {
> +  : public URLRequestJob,
> +    public DirectoryLister::DirectoryListerDelegate {
>  public:
> -  URLRequestFileDirJob(net::URLRequest* request, const FilePath&
> dir_path);
> +  URLRequestFileDirJob(URLRequest* request, const FilePath& dir_path);
>
> -  // net::URLRequestJob methods:
> +  // Overridden from URLRequestJob:
>   virtual void Start();
>   virtual void StartAsync();
>   virtual void Kill();
> -  virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int
> *bytes_read);
> +  virtual bool ReadRawData(IOBuffer* buf, int buf_size, int *bytes_read);
>   virtual bool GetMimeType(std::string* mime_type) const;
>   virtual bool GetCharset(std::string* charset);
>
> -  // DirectoryLister::DirectoryListerDelegate methods:
> +  // Overridden from DirectoryLister::DirectoryListerDelegate:
>   virtual void OnListFile(
> -      const net::DirectoryLister::DirectoryListerData& data);
> +      const DirectoryLister::DirectoryListerData& data);
>   virtual void OnListDone(int error);
>
>   bool list_complete() const { return list_complete_; }
> @@ -47,7 +49,7 @@ class URLRequestFileDirJob
>   // Fills a buffer with the output.
>   bool FillReadBuffer(char *buf, int buf_size, int *bytes_read);
>
> -  scoped_refptr<net::DirectoryLister> lister_;
> +  scoped_refptr<DirectoryLister> lister_;
>   FilePath dir_path_;
>   std::string data_;
>   bool canceled_;
> @@ -62,11 +64,13 @@ class URLRequestFileDirJob
>   // we wait for IO to complete.  When done, we fill the buffer
>   // manually.
>   bool read_pending_;
> -  scoped_refptr<net::IOBuffer> read_buffer_;
> +  scoped_refptr<IOBuffer> read_buffer_;
>   int read_buffer_length_;
>   ScopedRunnableMethodFactory<URLRequestFileDirJob> method_factory_;
>
>   DISALLOW_COPY_AND_ASSIGN(URLRequestFileDirJob);
>  };
>
> -#endif  // NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H__
> +}  // namespace net
> +
> +#endif  // NET_URL_REQUEST_URL_REQUEST_FILE_DIR_JOB_H_
>
>
>

[Timur Iskhodzhanov, 2010-12-30 07:19:43]

Some Valgrind suppressions stopped matching their stack due to net:: being added
which made half of the memory waterfall red for a while
Please watch the memory waterfall after commiting

[Alexander Potapenko, 2010-12-30 09:49:45]

Looks like these leaks are new. I've filed bug 68290 to track this.

[wtc, 2011-01-05 00:17:17]

LGTM.

http://codereview.chromium.org/5958008/diff/1/net/url_request/url_request_fil...
File net/url_request/url_request_file_dir_job.h (left):

http://codereview.chromium.org/5958008/diff/1/net/url_request/url_request_fil...
net/url_request/url_request_file_dir_job.h:23: // net::URLRequestJob methods:
Nit: the "<base class> methods:" comments are the convention
(or rather, one of the conventions) we use in the "net" module.