Revert of Reimplement AccountManagerHelper singleton instance creation

components/signin/core/browser/account_tracker_service_unittest.cc

 // Copyright 2014 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 <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/account_tracker_service.h"
-#include "components/signin/core/browser/child_account_info_fetcher.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 220 matching lines @@
 
 }  // namespace
 
 class AccountTrackerServiceTest : public testing::Test {
  public:
   AccountTrackerServiceTest() {}
 
   ~AccountTrackerServiceTest() override {}
 
   void SetUp() override {
-    ChildAccountInfoFetcher::InitializeForTests();
-
     fake_oauth2_token_service_.reset(new FakeOAuth2TokenService());
 
     pref_service_.registry()->RegisterListPref(
         AccountTrackerService::kAccountInfoPref);
     pref_service_.registry()->RegisterIntegerPref(
         prefs::kAccountIdMigrationState,
         AccountTrackerService::MIGRATION_NOT_STARTED);
     pref_service_.registry()->RegisterInt64Pref(
         AccountFetcherService::kLastUpdatePref, 0);
     signin_client_.reset(new TestSigninClient(&pref_service_));
@@ skipping 941 matching lines @@
   ASSERT_FALSE(info.is_child_account);
   ASSERT_TRUE(observer.CheckEvents(TrackingEvent(UPDATED, child_id)));
 
   SimulateTokenRevoked(child_id);
   ASSERT_TRUE(observer.CheckEvents(TrackingEvent(REMOVED, child_id)));
 
   tracker.RemoveObserver(&observer);
   fetcher.Shutdown();
   tracker.Shutdown();
 }