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

components/arc/arc_service_manager.h

 // 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.
 
 #ifndef COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
 #define COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/intent_helper/local_activity_resolver.h"
 #include "components/prefs/pref_member.h"
 #include "components/signin/core/account_id/account_id.h"
 
 namespace arc {
 
 class ArcBridgeService;
 class ArcService;
+class ArcUserDataService;
 
 // Manages creation and destruction of services that communicate with the ARC
 // instance via the ArcBridgeService.
 class ArcServiceManager {
  public:
   explicit ArcServiceManager(
       scoped_refptr<base::TaskRunner> blocking_task_runner);
   virtual ~ArcServiceManager();
 
   // |arc_bridge_service| can only be accessed on the thread that this
@@ skipping 28 matching lines @@
       std::unique_ptr<ArcBridgeService> arc_bridge_service);
 
   // Returns the icon loader owned by ArcServiceManager and shared by services.
   scoped_refptr<ActivityIconLoader> icon_loader() { return icon_loader_; }
 
   // Returns the activity resolver owned by ArcServiceManager.
   scoped_refptr<LocalActivityResolver> activity_resolver() {
     return activity_resolver_;
   }
 
+  ArcUserDataService* arc_user_data_service() {
+    return arc_user_data_service_.get();
+  }
+
  private:
   base::ThreadChecker thread_checker_;
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   std::unique_ptr<ArcBridgeService> arc_bridge_service_;
   std::vector<std::unique_ptr<ArcService>> services_;
   scoped_refptr<ActivityIconLoader> icon_loader_;
   scoped_refptr<LocalActivityResolver> activity_resolver_;
+  std::unique_ptr<ArcUserDataService> arc_user_data_service_;
 
   // True once the window manager service got added, barring adding any more
   // of those since OnAshStarted() might be called multiple times.
   bool on_ash_started_called_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(ArcServiceManager);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_SERVICE_MANAGER_H_