Decouple the browsing data counters initialization and start.

chrome/browser/browsing_data/passwords_counter_browsertest.cc

 // Copyright (c) 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/browsing_data/passwords_counter.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
@@ skipping 112 matching lines @@
   AddLogin("https://www.google.com", "user1", false);
   AddLogin("https://www.google.com", "user2", false);
   AddLogin("https://www.google.com", "user3", false);
   AddLogin("https://www.chrome.com", "user1", false);
   AddLogin("https://www.chrome.com", "user2", false);
 
   PasswordsCounter counter;
   counter.Init(browser()->profile(),
                base::Bind(&PasswordsCounterTest::Callback,
                           base::Unretained(this)));
+  counter.Restart();
 
   WaitForCounting();
   EXPECT_EQ(5u, GetResult());
 }
 
 // Tests that the counter doesn't count blacklisted entries.
 IN_PROC_BROWSER_TEST_F(PasswordsCounterTest, Blacklisted) {
   AddLogin("https://www.google.com", "user1", false);
   AddLogin("https://www.google.com", "user2", true);
   AddLogin("https://www.chrome.com", "user3", true);
 
   PasswordsCounter counter;
   counter.Init(browser()->profile(),
                base::Bind(&PasswordsCounterTest::Callback,
                           base::Unretained(this)));
+  counter.Restart();
 
   WaitForCounting();
   EXPECT_EQ(1u, GetResult());
 }
 
 // Tests that the counter starts counting automatically when the deletion
 // pref changes to true.
 IN_PROC_BROWSER_TEST_F(PasswordsCounterTest, PrefChanged) {
   SetPasswordsDeletionPref(false);
   AddLogin("https://www.google.com", "user", false);
@@ skipping 12 matching lines @@
 // Tests that the counter does not count passwords if the deletion
 // preference is false.
 IN_PROC_BROWSER_TEST_F(PasswordsCounterTest, PrefIsFalse) {
   SetPasswordsDeletionPref(false);
   AddLogin("https://www.google.com", "user", false);
 
   PasswordsCounter counter;
   counter.Init(browser()->profile(),
                base::Bind(&PasswordsCounterTest::Callback,
                           base::Unretained(this)));
+  counter.Restart();
 
   EXPECT_FALSE(counter.cancelable_task_tracker()->HasTrackedTasks());
 }
 
 // Tests that the counter starts counting automatically when
 // the password store changes.
 IN_PROC_BROWSER_TEST_F(PasswordsCounterTest, StoreChanged) {
   AddLogin("https://www.google.com", "user", false);
 
   PasswordsCounter counter;
   counter.Init(browser()->profile(),
                base::Bind(&PasswordsCounterTest::Callback,
                           base::Unretained(this)));
+  counter.Restart();
 
   WaitForCounting();
   EXPECT_EQ(1u, GetResult());
 
   AddLogin("https://www.chrome.com", "user", false);
   WaitForCounting();
   EXPECT_EQ(2u, GetResult());
 
   RemoveLogin("https://www.chrome.com", "user", false);
   WaitForCounting();
@@ skipping 31 matching lines @@
   SetDeletionPeriodPref(BrowsingDataRemover::FOUR_WEEKS);
   WaitForCounting();
   EXPECT_EQ(3u, GetResult());
 
   SetDeletionPeriodPref(BrowsingDataRemover::EVERYTHING);
   WaitForCounting();
   EXPECT_EQ(4u, GetResult());
 }
 
 }  // namespace