Un-refcount AutofillWebData and TokenWebData

components/webdata/common/web_data_service_base.h

Index: components/webdata/common/web_data_service_base.h
diff --git a/components/webdata/common/web_data_service_base.h b/components/webdata/common/web_data_service_base.h
index a3abd9bad2c41bd4fc55b651d9cbff0d85e41c5c..c261fecd1600b5de22c12b11474d7aac4a72c7ee 100644
--- a/components/webdata/common/web_data_service_base.h
+++ b/components/webdata/common/web_data_service_base.h
@@ -22,9 +22,7 @@ class Thread;
 }
 
 // Base for WebDataService class hierarchy.
-class WEBDATA_EXPORT WebDataServiceBase
-    : public base::RefCountedThreadSafe<WebDataServiceBase,
-          content::BrowserThread::DeleteOnUIThread> {
+class WEBDATA_EXPORT WebDataServiceBase {
  public:
   // All requests return an opaque handle of the following type.
   typedef int Handle;
@@ -47,6 +45,8 @@ class WEBDATA_EXPORT WebDataServiceBase
   WebDataServiceBase(scoped_refptr<WebDatabaseService> wdbs,
                      const ProfileErrorCallback& callback);
 
+  virtual ~WebDataServiceBase();
+
   // Cancel any pending request. You need to call this method if your
   // WebDataServiceConsumer is about to be deleted.
   virtual void CancelRequest(Handle h);
@@ -83,20 +83,13 @@ class WEBDATA_EXPORT WebDataServiceBase
   virtual WebDatabase* GetDatabase();
 
  protected:
-  virtual ~WebDataServiceBase();
-
   // Our database service.
   scoped_refptr<WebDatabaseService> wdbs_;
 
  private:
-  friend struct content::BrowserThread::DeleteOnThread<
-      content::BrowserThread::UI>;
-  friend class base::DeleteHelper<WebDataServiceBase>;
-  // We have to friend RCTS<> so WIN shared-lib build is happy (crbug/112250).
-  friend class base::RefCountedThreadSafe<WebDataServiceBase,
-      content::BrowserThread::DeleteOnUIThread>;
-
   ProfileErrorCallback profile_error_callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebDataServiceBase);
 };
 
 #endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATA_SERVICE_BASE_H_