Un-refcount AutofillWebData and TokenWebData

components/autofill/browser/webdata/web_data_service_unittest.cc

 // 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.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
@@ skipping 58 matching lines @@
   virtual void SetUp() {
     db_thread_.Start();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath path = temp_dir_.path().AppendASCII("TestWebDB");
 
     wdbs_ = new WebDatabaseService(path);
     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();
 
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
     base::MessageLoop::current()->Run();
     db_thread_.Stop();
   }
 
   void WaitForDatabaseThread() {
     base::WaitableEvent done(false, false);
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
     done.Wait();
   }
 
   base::MessageLoopForUI message_loop_;
   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_;
 };
 
 class WebDataServiceAutofillTest : public WebDataServiceTest {
  public:
   WebDataServiceAutofillTest()
       : WebDataServiceTest(),
         unique_id1_(1),
         unique_id2_(2),
         test_timeout_(TimeDelta::FromSeconds(kWebDataServiceTimeoutSeconds)),
         done_event_(false, false) {}
 
  protected:
   virtual void SetUp() {
     WebDataServiceTest::SetUp();
     name1_ = ASCIIToUTF16("name1");
     name2_ = ASCIIToUTF16("name2");
     value1_ = ASCIIToUTF16("value1");
     value2_ = ASCIIToUTF16("value2");
 
     void(AutofillWebDataService::*add_observer_func)(
         AutofillWebDataServiceObserverOnDBThread*) =
         &AutofillWebDataService::AddObserver;
     BrowserThread::PostTask(
         BrowserThread::DB,
         FROM_HERE,
-        base::Bind(add_observer_func, wds_, &observer_));
+        base::Bind(add_observer_func,
+                   base::Unretained(wds_.get()), &observer_));
     WaitForDatabaseThread();
   }
 
   virtual void TearDown() {
     void(AutofillWebDataService::*remove_observer_func)(
         AutofillWebDataServiceObserverOnDBThread*) =
         &AutofillWebDataService::RemoveObserver;
     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();
   }
 
   void AppendFormField(const base::string16& name,
                        const base::string16& value,
                        std::vector<FormFieldData>* form_fields) {
     FormFieldData field;
     field.name = name;
@@ skipping 368 matching lines @@
 
   // Check that the credit card was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > card_consumer2;
   handle2 = wds_->GetCreditCards(&card_consumer2);
   base::MessageLoop::current()->Run();
   EXPECT_EQ(handle2, card_consumer2.handle());
   ASSERT_EQ(0U, card_consumer2.result().size());
 }
 
 }  // namespace autofill