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

content/browser/renderer_host/resource_dispatcher_host_unittest.cc

Index: content/browser/renderer_host/resource_dispatcher_host_unittest.cc
===================================================================
--- content/browser/renderer_host/resource_dispatcher_host_unittest.cc	(revision 98659)
+++ content/browser/renderer_host/resource_dispatcher_host_unittest.cc	(working copy)
@@ -6,13 +6,11 @@
 
 #include <vector>
 
-#include "base/bind.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/download/download_id.h"
 #include "content/browser/mock_resource_context.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
@@ -1133,12 +1131,6 @@
   EXPECT_EQ(net::ERR_FILE_NOT_FOUND, status.os_error());
 }
 
-namespace {
-DownloadId MockNextDownloadId() {
-  return DownloadId(reinterpret_cast<DownloadManager*>(0xFFFFFFFF), 0);
-}
-}
-
 // Test for http://crbug.com/76202 .  We don't want to destroy a
 // download request prematurely when processing a cancellation from
 // the renderer.
@@ -1159,8 +1151,6 @@
   HandleScheme("http");
 
   MakeTestRequest(render_view_id, request_id, GURL("http://example.com/blah"));
-  content::MockResourceContext::GetInstance()->set_next_download_id_thunk(
-      base::Bind(&MockNextDownloadId));
   // Return some data so that the request is identified as a download
   // and the proper resource handlers are created.
   EXPECT_TRUE(net::URLRequestTestJob::ProcessOnePendingMessage());
@@ -1196,8 +1186,6 @@
   HandleScheme("http");
 
   MakeTestRequest(render_view_id, request_id, GURL("http://example.com/blah"));
-  content::MockResourceContext::GetInstance()->set_next_download_id_thunk(
-      base::Bind(&MockNextDownloadId));
   // Return some data so that the request is identified as a download
   // and the proper resource handlers are created.
   EXPECT_TRUE(net::URLRequestTestJob::ProcessOnePendingMessage());