1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 4421b71..3a6c83b 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -12,7 +12,6 @@
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/form_field.h"
@@ -146,9 +145,7 @@ template <class T> class WDObjectResult : public WDTypedResult {
 
 class WebDataServiceConsumer;
 
-class WebDataService
-    : public base::RefCountedThreadSafe<WebDataService,
-                                        ChromeThread::DeleteOnUIThread> {
+class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
  public:
 
   // All requests return an opaque handle of the following type.
@@ -432,8 +429,6 @@ class WebDataService
   //////////////////////////////////////////////////////////////////////////////
  private:
   friend class base::RefCountedThreadSafe<WebDataService>;
-  friend class ChromeThread;
-  friend class DeleteTask<WebDataService>;
   friend class ShutdownTask;
 
   typedef GenericRequest2<std::vector<const TemplateURL*>,
@@ -512,6 +507,8 @@ class WebDataService
 
   void GetWebAppImagesImpl(GenericRequest<GURL>* request);
 
+  base::Thread* thread() { return thread_; }
+
   // Schedule a task on our worker thread.
   void ScheduleTask(Task* t);
 
@@ -521,8 +518,8 @@ class WebDataService
   // Return the next request handle.
   int GetNextRequestHandle();
 
-  // True once initialization has started.
-  bool is_running_;
+  // Our worker thread. All requests are processed from that thread.
+  base::Thread* thread_;
 
   // The path with which to initialize the database.
   FilePath path_;