Fix up warnings in net/

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

7 files changed, 11 insertions, 9 deletions

diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h
index 1f1bffd..d19a515 100644
--- a/net/disk_cache/backend_impl.h
+++ b/net/disk_cache/backend_impl.h
@@ -47,12 +47,12 @@ namespace disk_cache {
 class BackendImpl : public Backend {
  public:
   explicit BackendImpl(const std::wstring& path)
-      : path_(path), init_(false), mask_(0), block_files_(path),
-        unit_test_(false), restarted_(false), max_size_(0) {}
+      : path_(path), block_files_(path), mask_(0), max_size_(0),
+        init_(false), restarted_(false), unit_test_(false) {}
   // mask can be used to limit the usable size of the hash table, for testing.
   BackendImpl(const std::wstring& path, uint32 mask)
-      : path_(path), init_(false), mask_(mask), block_files_(path),
-        unit_test_(false), restarted_(false), max_size_(0) {}
+      : path_(path), block_files_(path), mask_(mask), max_size_(0),
+        init_(false), restarted_(false), unit_test_(false) {}
   ~BackendImpl();
 
   // Performs general initialization for this current instance of the cache.
diff --git a/net/disk_cache/block_files.h b/net/disk_cache/block_files.h
index f0f27ec..6292256 100644
--- a/net/disk_cache/block_files.h
+++ b/net/disk_cache/block_files.h
@@ -45,7 +45,7 @@ class EntryImpl;
 class BlockFiles {
  public:
   explicit BlockFiles(const std::wstring& path)
-      : path_(path), init_(false), zero_buffer_(NULL) {}
+      : init_(false), zero_buffer_(NULL), path_(path) {}
   ~BlockFiles();
 
   // Performs the object initialization. create_files indicates if the backing
diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h
index 64a71b9..5757f80 100644
--- a/net/disk_cache/file.h
+++ b/net/disk_cache/file.h
@@ -45,6 +45,8 @@ class FileIOCallback {
   // Notified of the actual number of bytes read or written. This value is
   // negative if an error occurred.
   virtual void OnFileIOComplete(int bytes_copied) = 0;
+  
+  virtual ~FileIOCallback() {}
 };
 
 // Simple wrapper around a file that allows asynchronous operations.
diff --git a/net/disk_cache/file_lock.h b/net/disk_cache/file_lock.h
index 4134ad9..e2160f0 100644
--- a/net/disk_cache/file_lock.h
+++ b/net/disk_cache/file_lock.h
@@ -54,7 +54,7 @@ namespace disk_cache {
 class FileLock {
  public:
   explicit FileLock(BlockFileHeader* header);
-  ~FileLock() {
+  virtual ~FileLock() {
     Unlock();
   }
   // Virtual to make sure the compiler never inlines the calls.
diff --git a/net/disk_cache/mapped_file.h b/net/disk_cache/mapped_file.h
index ece272a..c2f0295 100644
--- a/net/disk_cache/mapped_file.h
+++ b/net/disk_cache/mapped_file.h
@@ -47,7 +47,7 @@ namespace disk_cache {
 // time).
 class MappedFile : public File {
  public:
-  MappedFile() : init_(false), File(true) {}
+  MappedFile() : File(true), init_(false) {}
 
   // Performs object initialization. name is the file to use, and size is the
   // ammount of data to memory map from th efile. If size is 0, the whole file
diff --git a/net/disk_cache/rankings.h b/net/disk_cache/rankings.h
index 6e7f750..3291b1d 100644
--- a/net/disk_cache/rankings.h
+++ b/net/disk_cache/rankings.h
@@ -80,7 +80,7 @@ class Rankings {
    public:
     explicit ScopedRankingsBlock(Rankings* rankings) : rankings_(rankings) {}
     ScopedRankingsBlock(Rankings* rankings, CacheRankingsBlock* node)
-        : rankings_(rankings), scoped_ptr<CacheRankingsBlock>(node) {}
+        : scoped_ptr<CacheRankingsBlock>(node), rankings_(rankings) {}
 
     ~ScopedRankingsBlock() {
       rankings_->FreeRankingsBlock(get());
diff --git a/net/disk_cache/storage_block-inl.h b/net/disk_cache/storage_block-inl.h
index 08ade9a..6dfe025 100644
--- a/net/disk_cache/storage_block-inl.h
+++ b/net/disk_cache/storage_block-inl.h
@@ -38,7 +38,7 @@ namespace disk_cache {
 
 template<typename T> StorageBlock<T>::StorageBlock(MappedFile* file,
                                                    Addr address)
-    : file_(file), address_(address), data_(NULL), modified_(false),
+    : data_(NULL), file_(file), address_(address), modified_(false),
       own_data_(false), extended_(false) {
   if (address.num_blocks() > 1)
     extended_ = true;