Revert 98656 - Make a new integer field in sql::MetaTable (a per-profile db) containing a counter...

content/browser/download/download_resource_handler.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_RESOURCE_HANDLER_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "content/browser/download/download_file.h"
-#include "content/browser/download/download_id.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_handler.h"
 
 class DownloadFileManager;
 class ResourceDispatcherHost;
 struct DownloadBuffer;
 
 namespace net {
 class URLRequest;
 }  // namespace net
 
 // Forwards data to the download thread.
 class DownloadResourceHandler : public ResourceHandler {
  public:
-  DownloadResourceHandler(
-      ResourceDispatcherHost* rdh,
-      int render_process_host_id,
-      int render_view_id,
-      int request_id,
-      const GURL& url,
-      DownloadId dl_id,
-      DownloadFileManager* download_file_manager,
-      net::URLRequest* request,
-      bool save_as,
-      const DownloadSaveInfo& save_info);
+  DownloadResourceHandler(ResourceDispatcherHost* rdh,
+                          int render_process_host_id,
+                          int render_view_id,
+                          int request_id,
+                          const GURL& url,
+                          DownloadFileManager* download_file_manager,
+                          net::URLRequest* request,
+                          bool save_as,
+                          const DownloadSaveInfo& save_info);
 
   virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
 
   // Not needed, as this event handler ought to be the final resource.
   virtual bool OnRequestRedirected(int request_id, const GURL& url,
                                    ResourceResponse* response, bool* defer);
 
   // Send the download creation information to the download thread.
   virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
 
@@ skipping 21 matching lines @@
 
   void CheckWriteProgress();
 
   std::string DebugString() const;
 
  private:
   virtual ~DownloadResourceHandler();
 
   void StartPauseTimer();
 
-  DownloadId download_id_;
+  int download_id_;
   GlobalRequestID global_id_;
   int render_view_id_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   std::string content_disposition_;
   int64 content_length_;
   DownloadFileManager* download_file_manager_;
   net::URLRequest* request_;
   bool save_as_;  // Request was initiated via "Save As" by the user.
   DownloadSaveInfo save_info_;
   scoped_ptr<DownloadBuffer> buffer_;
   ResourceDispatcherHost* rdh_;
   bool is_paused_;
   base::OneShotTimer<DownloadResourceHandler> pause_timer_;
   base::TimeTicks download_start_time_;  // used to collect stats.
   static const int kReadBufSize = 32768;  // bytes
   static const size_t kLoadsToWrite = 100;  // number of data buffers queued
   static const int kThrottleTimeMs = 200;  // milliseconds
 
   DISALLOW_COPY_AND_ASSIGN(DownloadResourceHandler);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_RESOURCE_HANDLER_H_