Un-refcount AutofillWebData and TokenWebData

components/autofill/browser/webdata/web_data_service_unittest.cc

Index: components/autofill/browser/webdata/web_data_service_unittest.cc
diff --git a/components/autofill/browser/webdata/web_data_service_unittest.cc b/components/autofill/browser/webdata/web_data_service_unittest.cc
index ed64064884e8afe7266f904bfd3385287bd6f486..fefb8bb84a023cfb7b793493cbd9f7c55162a9b2 100644
--- a/components/autofill/browser/webdata/web_data_service_unittest.cc
+++ b/components/autofill/browser/webdata/web_data_service_unittest.cc
@@ -76,15 +76,15 @@ class WebDataServiceTest : public testing::Test {
     wdbs_->AddTable(scoped_ptr<WebDatabaseTable>(new AutofillTable("en-US")));
     wdbs_->LoadDatabase();
 
-    wds_ = new AutofillWebDataService(
-        wdbs_, WebDataServiceBase::ProfileErrorCallback());
+    wds_.reset(new AutofillWebDataService(
+        wdbs_, WebDataServiceBase::ProfileErrorCallback()));
     wds_->Init();
   }
 
   virtual void TearDown() {
     wds_->ShutdownOnUIThread();
     wdbs_->ShutdownDatabase();
-    wds_ = NULL;
+    wds_.reset();
     wdbs_ = NULL;
     WaitForDatabaseThread();
 
@@ -107,7 +107,7 @@ class WebDataServiceTest : public testing::Test {
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   base::FilePath profile_dir_;
-  scoped_refptr<AutofillWebDataService> wds_;
+  scoped_ptr<AutofillWebDataService> wds_;
   scoped_refptr<WebDatabaseService> wdbs_;
   base::ScopedTempDir temp_dir_;
 };
@@ -135,7 +135,8 @@ class WebDataServiceAutofillTest : public WebDataServiceTest {
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
-        base::Bind(add_observer_func, wds_, &observer_));
+        base::Bind(add_observer_func,
+                   base::Unretained(wds_.get()), &observer_));
     WaitForDatabaseThread();
   }
 
@@ -146,7 +147,8 @@ class WebDataServiceAutofillTest : public WebDataServiceTest {
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
-        base::Bind(remove_observer_func, wds_, &observer_));
+        base::Bind(remove_observer_func,
+                   base::Unretained(wds_.get()), &observer_));
     WaitForDatabaseThread();
 
     WebDataServiceTest::TearDown();