Revert of [M53 cherry-pick] Migrate ArcUserDataService into ArcAuthService.

components/arc/arc_service_manager.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 "components/arc/arc_service_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/arc/arc_bridge_bootstrap.h"
@@ skipping 80 matching lines @@
 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   services_.emplace_back(std::move(service));
 }
 
 void ArcServiceManager::OnPrimaryUserProfilePrepared(
     const AccountId& account_id,
     std::unique_ptr<BooleanPrefMember> arc_enabled_pref) {
   DCHECK(thread_checker_.CalledOnValidThread());
+
+  arc_user_data_service_.reset(new ArcUserDataService(arc_bridge_service(),
+      std::move(arc_enabled_pref), account_id));
+
   AddService(base::WrapUnique(
       new ArcNotificationManager(arc_bridge_service(), account_id)));
 }
 
 void ArcServiceManager::OnAshStarted() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // We might come here multiple times. As such we should only do this once.
   if (on_ash_started_called_)
     return;
 
   on_ash_started_called_ = true;
   AddService(
       base::WrapUnique(new ArcWindowManagerBridge(arc_bridge_service())));
 }
 
 void ArcServiceManager::Shutdown() {
   icon_loader_ = nullptr;
   activity_resolver_ = nullptr;
+  arc_user_data_service_ = nullptr;
   services_.clear();
 }
 
 //static
 void ArcServiceManager::SetArcBridgeServiceForTesting(
     std::unique_ptr<ArcBridgeService> arc_bridge_service) {
   if (g_arc_bridge_service_for_testing) {
     delete g_arc_bridge_service_for_testing;
   }
   g_arc_bridge_service_for_testing = arc_bridge_service.release();
 }
 
 }  // namespace arc