Separate WebDataRequest functionality from WebDataService

chrome/browser/webdata/web_data_service_win.cc

Index: chrome/browser/webdata/web_data_service_win.cc
diff --git a/chrome/browser/webdata/web_data_service_win.cc b/chrome/browser/webdata/web_data_service_win.cc
index 6c06ad4e83131707079c248935409cf28c564439..41b0d03f7290a012d89c122ed4bdc1cb07f1e46e 100644
--- a/chrome/browser/webdata/web_data_service_win.cc
+++ b/chrome/browser/webdata/web_data_service_win.cc
@@ -13,18 +13,14 @@ using base::Bind;
 
 void WebDataService::AddIE7Login(const IE7PasswordInfo& info) {
   GenericRequest<IE7PasswordInfo>* request =
-      new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), NULL,
-                                          info);
-  RegisterRequest(request);
+      new GenericRequest<IE7PasswordInfo>(this, NULL, &request_manager_, info);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::AddIE7LoginImpl, this, request));
 }
 
 void WebDataService::RemoveIE7Login(const IE7PasswordInfo& info) {
   GenericRequest<IE7PasswordInfo>* request =
-      new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(), NULL,
-                                          info);
-  RegisterRequest(request);
+      new GenericRequest<IE7PasswordInfo>(this, NULL, &request_manager_, info);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::RemoveIE7LoginImpl, this, request));
 }
@@ -33,16 +29,15 @@ WebDataService::Handle WebDataService::GetIE7Login(
     const IE7PasswordInfo& info,
     WebDataServiceConsumer* consumer) {
   GenericRequest<IE7PasswordInfo>* request =
-      new GenericRequest<IE7PasswordInfo>(this, GetNextRequestHandle(),
-                                          consumer, info);
-  RegisterRequest(request);
+      new GenericRequest<IE7PasswordInfo>(this, consumer, &request_manager_,
+                                          info);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::GetIE7LoginImpl, this, request));
   return request->GetHandle();
 }
 
 void WebDataService::AddIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request) {
-  if (db_ && !request->IsCancelled(NULL)) {
+  if (db_ && !request->IsCancelled()) {
     if (db_->GetLoginsTable()->AddIE7Login(request->arg()))
       ScheduleCommit();
   }
@@ -51,7 +46,7 @@ void WebDataService::AddIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request) {
 
 void WebDataService::RemoveIE7LoginImpl(
     GenericRequest<IE7PasswordInfo>* request) {
-  if (db_ && !request->IsCancelled(NULL)) {
+  if (db_ && !request->IsCancelled()) {
     if (db_->GetLoginsTable()->RemoveIE7Login(request->arg()))
       ScheduleCommit();
   }
@@ -60,7 +55,7 @@ void WebDataService::RemoveIE7LoginImpl(
 
 void WebDataService::GetIE7LoginImpl(
     GenericRequest<IE7PasswordInfo>* request) {
-  if (db_ && !request->IsCancelled(NULL)) {
+  if (db_ && !request->IsCancelled()) {
     IE7PasswordInfo result;
     db_->GetLoginsTable()->GetIE7Login(request->arg(), &result);
     request->SetResult(