Split Autofill webdata

chrome/browser/webdata/web_database_service.cc

 // Copyright 2013 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 "chrome/browser/webdata/web_database_service.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/api/webdata/web_data_results.h"
 #include "chrome/browser/api/webdata/web_data_service_consumer.h"
 #include "chrome/browser/webdata/web_data_request_manager.h"
-#include "chrome/browser/webdata/web_data_service.h"
 // TODO(caitkp): Remove this autofill dependency.
 #include "components/autofill/browser/autofill_country.h"
 
 using base::Bind;
 using base::FilePath;
 using content::BrowserThread;
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 233 matching lines @@
   }
 
   scoped_ptr<WebDataRequest> request(
       new WebDataRequest(NULL, wds_backend_->request_manager()));
 
   BrowserThread::PostTask(BrowserThread::DB, from_here,
       Bind(&WebDataServiceBackend::DBWriteTaskWrapper, wds_backend_,
            task, base::Passed(&request)));
 }
 
-WebDataService::Handle WebDatabaseService::ScheduleDBTaskWithResult(
+WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult(
     const tracked_objects::Location& from_here,
     const ReadTask& task,
     WebDataServiceConsumer* consumer) {
   DCHECK(consumer);
-  WebDataService::Handle handle = 0;
+  WebDataServiceBase::Handle handle = 0;
 
   if (!wds_backend_) {
     NOTREACHED() << "Task scheduled after Shutdown()";
     return handle;
   }
 
   scoped_ptr<WebDataRequest> request(
       new WebDataRequest(consumer, wds_backend_->request_manager()));
   handle = request->GetHandle();
 
   BrowserThread::PostTask(BrowserThread::DB, from_here,
       Bind(&WebDataServiceBackend::DBReadTaskWrapper, wds_backend_,
            task, base::Passed(&request)));
 
   return handle;
 }
 
 void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) {
   if (!wds_backend_)
     return;
   wds_backend_->request_manager()->CancelRequest(h);
 }