Replace profile statistics preference count with AutofillCounter

chrome/browser/profiles/profile_statistics_unittest.cc

 // Copyright 2015 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 "chrome/browser/profiles/profile_statistics.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 79 matching lines @@
   TestingProfileManager* manager() { return &manager_; }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfileManager manager_;
 };
 
 TEST_F(ProfileStatisticsTest, WaitOrCountBookmarks) {
   TestingProfile* profile = manager()->CreateTestingProfile("Test 1");
   ASSERT_TRUE(profile);
-  // We need a history service and a password store for the test to succeed.
+  // We need history, autofill and password services for the test to succeed.
   ASSERT_TRUE(profile->CreateHistoryService(true, false));
+  profile->CreateWebDataService();
   PasswordStoreFactory::GetInstance()->SetTestingFactory(
       profile,
       password_manager::BuildPasswordStore<
           content::BrowserContext, password_manager::TestPasswordStore>);
 
   bookmarks::BookmarkModel* bookmark_model =
       CreateBookmarkModelWithoutLoad(profile);
   ASSERT_TRUE(bookmark_model);
 
   // Run ProfileStatisticsAggregator::WaitOrCountBookmarks.
   BookmarkStatHelper bookmark_stat_helper;
   base::RunLoop run_loop_aggregator_done;
 
-  scoped_refptr<ProfileStatisticsAggregator> aggregator =
-      new ProfileStatisticsAggregator(profile,
-                                      run_loop_aggregator_done.QuitClosure());
-  aggregator->AddCallbackAndStartAggregator(
+  ProfileStatisticsAggregator aggregator(
+      profile, run_loop_aggregator_done.QuitClosure());
+  aggregator.AddCallbackAndStartAggregator(
       base::Bind(&BookmarkStatHelper::StatsCallback,
                  base::Unretained(&bookmark_stat_helper)));
 
   // Wait until ProfileStatisticsAggregator::WaitOrCountBookmarks is run.
   base::RunLoop run_loop1;
   run_loop1.RunUntilIdle();
   EXPECT_EQ(0, bookmark_stat_helper.GetNumOfTimesCalled());
 
   // Run ProfileStatisticsAggregator::WaitOrCountBookmarks again.
-  aggregator->AddCallbackAndStartAggregator(
+  aggregator.AddCallbackAndStartAggregator(
       profiles::ProfileStatisticsCallback());
   // Wait until ProfileStatisticsAggregator::WaitOrCountBookmarks is run.
   base::RunLoop run_loop2;
   run_loop2.RunUntilIdle();
   EXPECT_EQ(0, bookmark_stat_helper.GetNumOfTimesCalled());
 
   // Load the bookmark model. When the model is loaded (asynchronously), the
   // observer added by WaitOrCountBookmarks is run.
   LoadBookmarkModel(profile, bookmark_model);
 
   run_loop_aggregator_done.Run();
   EXPECT_EQ(1, bookmark_stat_helper.GetNumOfTimesCalled());
 }