Un-refcount AutofillWebData and TokenWebData

chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc

Index: chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
index ce020f96c5438e8d0c995135f8ec2803a821d5db..b506b0821974021b291ba28c83db571ca569e951 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc
@@ -106,10 +106,10 @@ class FakeWebDataService : public AutofillWebDataService {
     return result;
   }
 
- private:
   virtual ~FakeWebDataService() {
   }
 
+ private:
   void CreateSyncableService() {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
     // These services are deleted in DestroySyncableService().
@@ -226,7 +226,7 @@ class SyncAutofillDataTypeControllerTest : public testing::Test {
 TEST_F(SyncAutofillDataTypeControllerTest, StartWDSReady) {
   FakeWebDataService* web_db =
       static_cast<FakeWebDataService*>(
-          AutofillWebDataService::FromBrowserContext(&profile_).get());
+          AutofillWebDataService::FromBrowserContext(&profile_));
   web_db->LoadDatabase();
   autofill_dtc_->LoadModels(
     base::Bind(&SyncAutofillDataTypeControllerTest::OnLoadFinished,
@@ -259,7 +259,7 @@ TEST_F(SyncAutofillDataTypeControllerTest, StartWDSNotReady) {
 
   FakeWebDataService* web_db =
       static_cast<FakeWebDataService*>(
-        AutofillWebDataService::FromBrowserContext(&profile_).get());
+        AutofillWebDataService::FromBrowserContext(&profile_));
   web_db->LoadDatabase();
 
   EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _))
@@ -278,13 +278,13 @@ TEST_F(SyncAutofillDataTypeControllerTest, StartWDSNotReady) {
 TEST_F(SyncAutofillDataTypeControllerTest, UpdateAutofillCullingSettings) {
   FakeWebDataService* web_db =
       static_cast<FakeWebDataService*>(
-          AutofillWebDataService::FromBrowserContext(&profile_).get());
+          AutofillWebDataService::FromBrowserContext(&profile_));
 
   // Set up the experiments state.
-  ProfileSyncService* sync = ProfileSyncServiceFactory::GetForProfile(
-      &profile_);
   syncer::Experiments experiments;
   experiments.autofill_culling = true;
+  ProfileSyncService* sync = ProfileSyncServiceFactory::GetForProfile(
+      &profile_);
   sync->OnExperimentsChanged(experiments);
 
   web_db->LoadDatabase();