Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4425)

Unified Diff: chrome/browser/webdata/web_data_service.h

Issue 11862010: Fix WebDataRequest ownership gap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tsan bug Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/webdata/web_data_request_manager.cc ('k') | chrome/browser/webdata/web_data_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/web_data_service.h
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index f311083a056bdb246c80b68691c5af14091781ae..09ee5083ed39c84f2e794c9b6ecbc30a2f3c519d 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -327,9 +327,6 @@ class 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.
@@ -374,10 +371,10 @@ class WebDataService
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();
@@ -489,7 +486,7 @@ class WebDataService
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
« no previous file with comments | « chrome/browser/webdata/web_data_request_manager.cc ('k') | chrome/browser/webdata/web_data_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698