Fix WebDataRequest ownership gap

chrome/browser/webdata/web_data_service.h

 // Copyright (c) 2012 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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
@@ skipping 309 matching lines @@
   friend class TemplateURLServiceTest;
   friend class TemplateURLServiceTestingProfile;
   friend class WebDataServiceTest;
   friend class WebDataRequest;
 
   virtual ~WebDataService();
 
   // This is invoked by the unit test; path is the path of the Web Data file.
   bool InitWithPath(const FilePath& path);
 
-  // Invoked by request implementations when a request has been processed.
-  void RequestCompleted(Handle h);
-
   //////////////////////////////////////////////////////////////////////////////
   //
   // The following methods are only invoked in the web data service thread.
   //
   //////////////////////////////////////////////////////////////////////////////
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<WebDataService>;
 
@@ skipping 24 matching lines @@
 
   void ScheduleDBTask(const tracked_objects::Location& from_here,
                       const base::Closure& task);
 
   WebDataService::Handle ScheduleDBTaskWithResult(
       const tracked_objects::Location& from_here,
       const ResultTask& task,
       WebDataServiceConsumer* consumer);
 
   void DBTaskWrapper(const base::Closure& task,
-                     WebDataRequest* request);
+                     scoped_ptr<WebDataRequest> request);
 
   void DBResultTaskWrapper(const ResultTask& task,
-                           WebDataRequest* request);
+                           scoped_ptr<WebDataRequest> request);
 
   // Schedule a commit if one is not already pending.
   void ScheduleCommit();
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords.
   //
   //////////////////////////////////////////////////////////////////////////////
   void AddKeywordImpl(const TemplateURLData& data);
@@ skipping 91 matching lines @@
   bool is_running_;
 
   // The path with which to initialize the database.
   FilePath path_;
 
   // Our database.  We own the |db_|, but don't use a |scoped_ptr| because the
   // |db_| lifetime must be managed on the database thread.
   WebDatabase* db_;
 
   // Keeps track of all pending requests made to the db.
-  WebDataRequestManager request_manager_;
+  scoped_refptr<WebDataRequestManager> request_manager_;
 
   // The application locale.  The locale is needed for some database migrations,
   // and must be read on the UI thread.  It's cached here so that we can pass it
   // to the migration code on the DB thread.
   const std::string app_locale_;
 
   // Syncable services for the database data.  We own the services, but don't
   // use |scoped_ptr|s because the lifetimes must be managed on the database
   // thread.
   // Currently only Autocomplete and Autofill profiles use the new Sync API, but
   // all the database data should migrate to this API over time.
   AutocompleteSyncableService* autocomplete_syncable_service_;
   AutofillProfileSyncableService* autofill_profile_syncable_service_;
 
   // Whether the database failed to initialize.  We use this to avoid
   // continually trying to reinit.
   bool failed_init_;
 
   // Whether we should commit the database.
   bool should_commit_;
 
   // MessageLoop the WebDataService is created on.
   MessageLoop* main_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__