Revert "Improve the no-op reconcilor so that it doesn't "hang" after the first execution, but inste…

chrome/browser/signin/account_reconcilor_unittest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/signin/account_reconcilor_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/test_signin_client_builder.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
-#include "chrome/test/base/uma_histogram_helper.h"
 #include "components/signin/core/browser/account_reconcilor.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
+#include "components/signin/core/common/signin_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTestEmail[] = "user@gmail.com";
-const char* const kHistogramsToSnapshot[] = {
-    "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun",
-    "Signin.Reconciler.AddedToCookieJar.FirstRun",
-    "Signin.Reconciler.AddedToChrome.FirstRun",
-    "Signin.Reconciler.DifferentPrimaryAccounts.SubsequentRun",
-    "Signin.Reconciler.AddedToCookieJar.SubsequentRun",
-    "Signin.Reconciler.AddedToChrome.SubsequentRun"};
 
 class MockAccountReconcilor : public testing::StrictMock<AccountReconcilor> {
  public:
   static KeyedService* Build(content::BrowserContext* context);
 
   MockAccountReconcilor(ProfileOAuth2TokenService* token_service,
                         SigninManagerBase* signin_manager,
                         SigninClient* client);
   virtual ~MockAccountReconcilor() {}
 
@@ skipping 23 matching lines @@
 MockAccountReconcilor::MockAccountReconcilor(
     ProfileOAuth2TokenService* token_service,
     SigninManagerBase* signin_manager,
     SigninClient* client)
     : testing::StrictMock<AccountReconcilor>(token_service,
                                              signin_manager,
                                              client) {}
 
 }  // namespace
 
-class AccountReconcilorTest : public ::testing::TestWithParam<bool> {
+class AccountReconcilorTest : public testing::Test {
  public:
   AccountReconcilorTest();
   virtual void SetUp() OVERRIDE;
 
   TestingProfile* profile() { return profile_; }
   FakeSigninManagerForTesting* signin_manager() { return signin_manager_; }
   FakeProfileOAuth2TokenService* token_service() { return token_service_; }
-  UMAHistogramHelper* histogram_helper() { return &histogram_helper_; }
 
   void SetFakeResponse(const std::string& url,
                        const std::string& data,
                        net::HttpStatusCode code,
                        net::URLRequestStatus::Status status) {
     url_fetcher_factory_.SetFakeResponse(GURL(url), data, code, status);
   }
 
   MockAccountReconcilor* GetMockReconcilor();
 
   void SimulateMergeSessionCompleted(
       MergeSessionHelper::Observer* observer,
       const std::string& account_id,
       const GoogleServiceAuthError& error);
 
   void SimulateRefreshTokenFetched(
       AccountReconcilor* reconcilor,
       const std::string& account_id,
       const std::string& refresh_token);
 
  private:
   content::TestBrowserThreadBundle bundle_;
   TestingProfile* profile_;
   FakeSigninManagerForTesting* signin_manager_;
   FakeProfileOAuth2TokenService* token_service_;
   MockAccountReconcilor* mock_reconcilor_;
   net::FakeURLFetcherFactory url_fetcher_factory_;
   scoped_ptr<TestingProfileManager> testing_profile_manager_;
-  UMAHistogramHelper histogram_helper_;
-
-  DISALLOW_COPY_AND_ASSIGN(AccountReconcilorTest);
 };
 
 AccountReconcilorTest::AccountReconcilorTest()
     : signin_manager_(NULL),
       token_service_(NULL),
       mock_reconcilor_(NULL),
       url_fetcher_factory_(NULL) {}
 
 void AccountReconcilorTest::SetUp() {
-  // If it's a non-parameterized test, or we have a parameter of true, set flag.
-  if (!::testing::UnitTest::GetInstance()->current_test_info()->value_param() ||
-      GetParam()) {
-    switches::EnableAccountConsistencyForTesting(
-        CommandLine::ForCurrentProcess());
-  }
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableNewProfileManagement);
 
   testing_profile_manager_.reset(
       new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
   ASSERT_TRUE(testing_profile_manager_.get()->SetUp());
 
   TestingProfile::TestingFactories factories;
   factories.push_back(std::make_pair(ChromeSigninClientFactory::GetInstance(),
       signin::BuildTestSigninClient));
   factories.push_back(std::make_pair(
       ProfileOAuth2TokenServiceFactory::GetInstance(),
       BuildFakeProfileOAuth2TokenService));
   factories.push_back(std::make_pair(SigninManagerFactory::GetInstance(),
       FakeSigninManagerBase::Build));
   factories.push_back(std::make_pair(AccountReconcilorFactory::GetInstance(),
       MockAccountReconcilor::Build));
 
   profile_ = testing_profile_manager_.get()->CreateTestingProfile("name",
                               scoped_ptr<PrefServiceSyncable>(),
                               base::UTF8ToUTF16("name"), 0, std::string(),
                               factories);
 
   signin_manager_ =
       static_cast<FakeSigninManagerForTesting*>(
           SigninManagerFactory::GetForProfile(profile()));
 
   token_service_ =
       static_cast<FakeProfileOAuth2TokenService*>(
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile()));
-
-  // Take a new snapshot of the concerned histograms before each test
-  histogram_helper_.PrepareSnapshot(kHistogramsToSnapshot,
-                                    arraysize(kHistogramsToSnapshot));
 }
 
 MockAccountReconcilor* AccountReconcilorTest::GetMockReconcilor() {
   if (!mock_reconcilor_) {
     mock_reconcilor_ =
         static_cast<MockAccountReconcilor*>(
             AccountReconcilorFactory::GetForProfile(profile()));
   }
 
   return mock_reconcilor_;
@@ skipping 167 matching lines @@
 
   token_service()->IssueErrorForAllPendingRequests(
       GoogleServiceAuthError(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->AreAllRefreshTokensChecked());
   ASSERT_EQ(0u, reconcilor->GetValidChromeAccountsForTesting().size());
   ASSERT_EQ(1u, reconcilor->GetInvalidChromeAccountsForTesting().size());
 }
 
-TEST_P(AccountReconcilorTest, StartReconcileNoop) {
+TEST_F(AccountReconcilorTest, StartReconcileNoop) {
   signin_manager()->SetAuthenticatedUsername(kTestEmail);
   token_service()->UpdateCredentials(kTestEmail, "refresh_token");
 
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
       net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(),
       "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS);
 
   reconcilor->StartReconcile();
   ASSERT_FALSE(reconcilor->AreGaiaAccountsSet());
   ASSERT_FALSE(reconcilor->AreAllRefreshTokensChecked());
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->AreGaiaAccountsSet());
   ASSERT_EQ(1u, reconcilor->GetGaiaAccountsForTesting().size());
   ASSERT_FALSE(reconcilor->AreAllRefreshTokensChecked());
 
   token_service()->IssueAllTokensForAccount("user@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->AreAllRefreshTokensChecked());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectTotalCount(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 0, 1);
 }
 
 // This is test is needed until chrome changes to use gaia obfuscated id.
 // The signin manager and token service use the gaia "email" property, which
 // preserves dots in usernames and preserves case. gaia::ParseListAccountsData()
 // however uses gaia "displayEmail" which does not preserve case, and then
 // passes the string through gaia::CanonicalizeEmail() which removes dots.  This
 // tests makes sure that an email like "Dot.S@hmail.com", as seen by the
 // token service, will be considered the same as "dots@gmail.com" as returned
 // by gaia::ParseListAccountsData().
-TEST_P(AccountReconcilorTest, StartReconcileNoopWithDots) {
+TEST_F(AccountReconcilorTest, StartReconcileNoopWithDots) {
   signin_manager()->SetAuthenticatedUsername("Dot.S@gmail.com");
   token_service()->UpdateCredentials("Dot.S@gmail.com", "refresh_token");
 
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"dot.s@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
       net::HTTP_OK, net::URLRequestStatus::SUCCESS);
@@ skipping 10 matching lines @@
   ASSERT_STREQ("dots@gmail.com",
                reconcilor->GetGaiaAccountsForTesting()[0].first.c_str());
   ASSERT_FALSE(reconcilor->AreAllRefreshTokensChecked());
 
   token_service()->IssueAllTokensForAccount("Dot.S@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->AreAllRefreshTokensChecked());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 0, 1);
 }
 
-TEST_P(AccountReconcilorTest, StartReconcileNoopMultiple) {
+TEST_F(AccountReconcilorTest, StartReconcileNoopMultiple) {
   signin_manager()->SetAuthenticatedUsername("user@gmail.com");
   token_service()->UpdateCredentials("user@gmail.com", "refresh_token");
   token_service()->UpdateCredentials("other@gmail.com", "refresh_token");
 
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1], "
@@ skipping 16 matching lines @@
 
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(reconcilor->AreAllRefreshTokensChecked());
 
   token_service()->IssueAllTokensForAccount("user@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->AreAllRefreshTokensChecked());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectTotalCount(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 0, 1);
 }
 
-TEST_P(AccountReconcilorTest, StartReconcileAddToCookie) {
+TEST_F(AccountReconcilorTest, StartReconcileAddToCookie) {
   signin_manager()->SetAuthenticatedUsername("user@gmail.com");
   token_service()->UpdateCredentials("user@gmail.com", "refresh_token");
   token_service()->UpdateCredentials("other@gmail.com", "refresh_token");
 
   EXPECT_CALL(*GetMockReconcilor(), PerformMergeAction("other@gmail.com"));
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
       net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(),
       "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS);
 
   AccountReconcilor* reconcilor = GetMockReconcilor();
   reconcilor->StartReconcile();
   token_service()->IssueAllTokensForAccount("other@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
   token_service()->IssueAllTokensForAccount("user@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->is_reconcile_started_);
   SimulateMergeSessionCompleted(reconcilor, "other@gmail.com",
                                 GoogleServiceAuthError::AuthErrorNone());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 0, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToCookieJar.FirstRun", 1, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
 }
 
-TEST_P(AccountReconcilorTest, StartReconcileAddToCookieTwice) {
-  signin_manager()->SetAuthenticatedUsername("user@gmail.com");
-  token_service()->UpdateCredentials("user@gmail.com", "refresh_token");
-  token_service()->UpdateCredentials("other@gmail.com", "refresh_token");
-
-  EXPECT_CALL(*GetMockReconcilor(), PerformMergeAction("other@gmail.com"));
-  EXPECT_CALL(*GetMockReconcilor(), PerformMergeAction("third@gmail.com"));
-
-  SetFakeResponse(
-      GaiaUrls::GetInstance()->list_accounts_url().spec(),
-      "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
-      net::HTTP_OK,
-      net::URLRequestStatus::SUCCESS);
-  SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(),
-                  "{\"id\":\"foo\"}",
-                  net::HTTP_OK,
-                  net::URLRequestStatus::SUCCESS);
-
-  AccountReconcilor* reconcilor = GetMockReconcilor();
-  reconcilor->StartReconcile();
-  token_service()->IssueAllTokensForAccount(
-      "other@gmail.com",
-      "access_token",
-      base::Time::Now() + base::TimeDelta::FromHours(1));
-  token_service()->IssueAllTokensForAccount(
-      "user@gmail.com",
-      "access_token",
-      base::Time::Now() + base::TimeDelta::FromHours(1));
-
-  base::RunLoop().RunUntilIdle();
-  ASSERT_TRUE(reconcilor->is_reconcile_started_);
-  SimulateMergeSessionCompleted(
-      reconcilor, "other@gmail.com", GoogleServiceAuthError::AuthErrorNone());
-  ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 0, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToCookieJar.FirstRun", 1, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
-
-  // Do another pass after I've added a third account to the token service
-
-  SetFakeResponse(
-      GaiaUrls::GetInstance()->list_accounts_url().spec(),
-      "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1], "
-      "[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
-      net::HTTP_OK,
-      net::URLRequestStatus::SUCCESS);
-  // This will cause the reconcilor to fire.
-  token_service()->UpdateCredentials("third@gmail.com", "refresh_token");
-
-  token_service()->IssueAllTokensForAccount(
-      "other@gmail.com",
-      "access_token",
-      base::Time::Now() + base::TimeDelta::FromHours(1));
-  token_service()->IssueAllTokensForAccount(
-      "user@gmail.com",
-      "access_token",
-      base::Time::Now() + base::TimeDelta::FromHours(1));
-  token_service()->IssueAllTokensForAccount(
-      "third@gmail.com",
-      "access_token",
-      base::Time::Now() + base::TimeDelta::FromHours(1));
-
-  base::RunLoop().RunUntilIdle();
-
-  ASSERT_TRUE(reconcilor->is_reconcile_started_);
-  SimulateMergeSessionCompleted(
-      reconcilor, "third@gmail.com", GoogleServiceAuthError::AuthErrorNone());
-  ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 0, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToCookieJar.FirstRun", 1, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.SubsequentRun", 0, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToCookieJar.SubsequentRun", 1, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToChrome.SubsequentRun", 0, 1);
-}
-
-TEST_P(AccountReconcilorTest, StartReconcileAddToChrome) {
+TEST_F(AccountReconcilorTest, StartReconcileAddToChrome) {
   signin_manager()->SetAuthenticatedUsername("user@gmail.com");
   token_service()->UpdateCredentials("user@gmail.com", "refresh_token");
 
   EXPECT_CALL(*GetMockReconcilor(),
               PerformAddToChromeAction("other@gmail.com", 1));
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1], "
                "[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
       net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(),
       "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS);
 
   AccountReconcilor* reconcilor = GetMockReconcilor();
   reconcilor->StartReconcile();
   token_service()->IssueAllTokensForAccount("user@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->is_reconcile_started_);
   SimulateRefreshTokenFetched(reconcilor, "other@gmail.com", "");
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 0, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToCookieJar.FirstRun", 0, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToChrome.FirstRun", 1, 1);
 }
 
-TEST_P(AccountReconcilorTest, StartReconcileBadPrimary) {
+TEST_F(AccountReconcilorTest, StartReconcileBadPrimary) {
   signin_manager()->SetAuthenticatedUsername("user@gmail.com");
   token_service()->UpdateCredentials("user@gmail.com", "refresh_token");
   token_service()->UpdateCredentials("other@gmail.com", "refresh_token");
 
   EXPECT_CALL(*GetMockReconcilor(), PerformLogoutAllAccountsAction());
   EXPECT_CALL(*GetMockReconcilor(), PerformMergeAction("user@gmail.com"));
   EXPECT_CALL(*GetMockReconcilor(), PerformMergeAction("other@gmail.com"));
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1], "
@@ skipping 10 matching lines @@
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(reconcilor->is_reconcile_started_);
   SimulateMergeSessionCompleted(reconcilor, "other@gmail.com",
                                 GoogleServiceAuthError::AuthErrorNone());
   ASSERT_TRUE(reconcilor->is_reconcile_started_);
   SimulateMergeSessionCompleted(reconcilor, "user@gmail.com",
                                 GoogleServiceAuthError::AuthErrorNone());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
-
-  histogram_helper()->Fetch();
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.DifferentPrimaryAccounts.FirstRun", 1, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToCookieJar.FirstRun", 2, 1);
-  histogram_helper()->ExpectUniqueSample(
-      "Signin.Reconciler.AddedToChrome.FirstRun", 0, 1);
 }
 
-TEST_P(AccountReconcilorTest, StartReconcileOnlyOnce) {
+TEST_F(AccountReconcilorTest, StartReconcileOnlyOnce) {
   signin_manager()->SetAuthenticatedUsername(kTestEmail);
   token_service()->UpdateCredentials(kTestEmail, "refresh_token");
 
   AccountReconcilor* reconcilor =
       AccountReconcilorFactory::GetForProfile(profile());
   ASSERT_TRUE(reconcilor);
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
       net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   SetFakeResponse(GaiaUrls::GetInstance()->people_get_url().spec(),
       "{\"id\":\"foo\"}", net::HTTP_OK, net::URLRequestStatus::SUCCESS);
 
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
   reconcilor->StartReconcile();
   ASSERT_TRUE(reconcilor->is_reconcile_started_);
 
   token_service()->IssueAllTokensForAccount("user@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
 }
 
-TEST_P(AccountReconcilorTest, StartReconcileWithSessionInfoExpiredDefault) {
+TEST_F(AccountReconcilorTest, StartReconcileWithSessionInfoExpiredDefault) {
   signin_manager()->SetAuthenticatedUsername("user@gmail.com");
   token_service()->UpdateCredentials("user@gmail.com", "refresh_token");
   token_service()->UpdateCredentials("other@gmail.com", "refresh_token");
 
   EXPECT_CALL(*GetMockReconcilor(), PerformMergeAction("user@gmail.com"));
 
   SetFakeResponse(GaiaUrls::GetInstance()->list_accounts_url().spec(),
       "[\"f\", [[\"b\", 0, \"n\", \"user@gmail.com\", \"p\", 0, 0, 0, 0, 0],"
                "[\"b\", 0, \"n\", \"other@gmail.com\", \"p\", 0, 0, 0, 0, 1]]]",
       net::HTTP_OK, net::URLRequestStatus::SUCCESS);
@@ skipping 11 matching lines @@
   token_service()->IssueAllTokensForAccount("user@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
   token_service()->IssueAllTokensForAccount("other@gmail.com", "access_token",
       base::Time::Now() + base::TimeDelta::FromHours(1));
 
   base::RunLoop().RunUntilIdle();
   SimulateMergeSessionCompleted(reconcilor, "user@gmail.com",
                                 GoogleServiceAuthError::AuthErrorNone());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
 }
-
-INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled,
-                        AccountReconcilorTest,
-                        testing::Bool());