More net/ method ordering.

net/url_request/url_request_file_dir_job.cc

 // 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.
 
 #include "net/url_request/url_request_file_dir_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
@@ skipping 15 matching lines @@
     : URLRequestJob(request),
       dir_path_(dir_path),
       canceled_(false),
       list_complete_(false),
       wrote_header_(false),
       read_pending_(false),
       read_buffer_length_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
-URLRequestFileDirJob::~URLRequestFileDirJob() {
-  DCHECK(read_pending_ == false);
-  DCHECK(lister_ == NULL);
-}
-
-void URLRequestFileDirJob::Start() {
-  // Start reading asynchronously so that all error reporting and data
-  // callbacks happen as they would for network requests.
-  MessageLoop::current()->PostTask(
-      FROM_HERE,
-      method_factory_.NewRunnableMethod(
-          &URLRequestFileDirJob::StartAsync));
-}
-
 void URLRequestFileDirJob::StartAsync() {
   DCHECK(!lister_);
 
   // TODO(willchan): This is stupid.  We should tell |lister_| not to call us
   // back.  Fix this stupidity.
 
   // AddRef so that *this* cannot be destroyed while the lister_
   // is trying to feed us data.
 
   AddRef();
   lister_ = new DirectoryLister(dir_path_, this);
   lister_->Start();
 
   NotifyHeadersComplete();
 }
 
+void URLRequestFileDirJob::Start() {
+  // Start reading asynchronously so that all error reporting and data
+  // callbacks happen as they would for network requests.
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
+      method_factory_.NewRunnableMethod(
+          &URLRequestFileDirJob::StartAsync));
+}
+
 void URLRequestFileDirJob::Kill() {
   if (canceled_)
     return;
 
   canceled_ = true;
 
   // 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 URLRequest at this time.
   if (lister_)
@@ skipping 91 matching lines @@
     read_pending_ = false;
     NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, error));
   } else {
     list_complete_ = true;
     CompleteRead();
   }
 
   Release();  // The Lister is finished; may delete *this*
 }
 
+URLRequestFileDirJob::~URLRequestFileDirJob() {
+  DCHECK(read_pending_ == false);
+  DCHECK(lister_ == NULL);
+}
+
 void URLRequestFileDirJob::CloseLister() {
   if (lister_) {
     lister_->Cancel();
     lister_->set_delegate(NULL);
     lister_ = NULL;
   }
 }
 
-bool URLRequestFileDirJob::FillReadBuffer(char *buf, int buf_size,
-                                          int *bytes_read) {
-  DCHECK(bytes_read);
-
-  *bytes_read = 0;
-
-  int count = std::min(buf_size, static_cast<int>(data_.size()));
-  if (count) {
-    memcpy(buf, &data_[0], count);
-    data_.erase(0, count);
-    *bytes_read = count;
-    return true;
-  } else if (list_complete_) {
-    // EOF
-    return true;
-  }
-  return false;
-}
-
 void URLRequestFileDirJob::CompleteRead() {
   if (read_pending_) {
     int bytes_read;
     if (FillReadBuffer(read_buffer_->data(), read_buffer_length_,
                        &bytes_read)) {
       // We completed the read, so reset the read buffer.
       read_pending_ = false;
       read_buffer_ = NULL;
       read_buffer_length_ = 0;
 
       SetStatus(URLRequestStatus());
       NotifyReadComplete(bytes_read);
     } else {
       NOTREACHED();
       // TODO: Better error code.
       NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, 0));
     }
   }
 }
 
+bool URLRequestFileDirJob::FillReadBuffer(char *buf, int buf_size,
+                                          int *bytes_read) {
+  DCHECK(bytes_read);
+
+  *bytes_read = 0;
+
+  int count = std::min(buf_size, static_cast<int>(data_.size()));
+  if (count) {
+    memcpy(buf, &data_[0], count);
+    data_.erase(0, count);
+    *bytes_read = count;
+    return true;
+  } else if (list_complete_) {
+    // EOF
+    return true;
+  }
+  return false;
+}
+
 }  // namespace net