arc: Pass auth token from Chrome to ARC instance.

components/arc/arc_service_manager.h

Index: components/arc/arc_service_manager.h
diff --git a/components/arc/arc_service_manager.h b/components/arc/arc_service_manager.h
index 205eb7ba0df054bd924fa24ede84d6d95f6dfbf9..f7262f517032c608da83bf32d27385ccda313507 100644
--- a/components/arc/arc_service_manager.h
+++ b/components/arc/arc_service_manager.h
@@ -10,6 +10,8 @@
 #include "base/threading/thread_checker.h"
 #include "components/signin/core/account_id/account_id.h"
 
+class Profile;
+
 namespace arc {
 
 class ArcAuthService;
@@ -19,6 +21,7 @@ class ArcImeBridge;
 class ArcInputBridge;
 class ArcIntentHelperBridge;
 class ArcNotificationManager;
+class ArcOptInManager;
 class ArcPowerBridge;
 class ArcSettingsBridge;
 class ArcVideoBridge;
@@ -27,7 +30,8 @@ class ArcVideoBridge;
 // instance via the ArcBridgeService.
 class ArcServiceManager {
  public:
-  ArcServiceManager(scoped_ptr<ArcAuthService> auth_service,
+  ArcServiceManager(scoped_ptr<ArcOptInManager> opt_in_manager,
+                    scoped_ptr<ArcAuthService> auth_service,

[lhc(google), 2016/01/22 22:18:33]

Please rebase, this interface changed. Now you need to
.AddService(make_scoped_ptr(...)) instead of modifying this class.

[khmel, 2016/01/23 00:41:43]

Rebased. Also moved code to ArcAuthService.

                     scoped_ptr<ArcIntentHelperBridge> intent_helper_bridge,
                     scoped_ptr<ArcSettingsBridge> settings_bridge,
                     scoped_ptr<ArcVideoBridge> video_bridge);
@@ -37,17 +41,21 @@ class ArcServiceManager {
   // class was created on.
   ArcBridgeService* arc_bridge_service();
 
+  ArcOptInManager* arc_opt_in_manager() { return arc_opt_in_manager_.get(); }
+
   // Gets the global instance of the ARC Service Manager. This can only be
   // called on the thread that this class was created on.
   static ArcServiceManager* Get();
 
   // Called when the main profile is initialized after user logs in.
-  void OnPrimaryUserProfilePrepared(const AccountId& account_id);
+  void SetProfileAndAccountId(Profile* profile, const AccountId& account_id);
 
  private:
   base::ThreadChecker thread_checker_;
   scoped_ptr<ArcBridgeService> arc_bridge_service_;
 
+  scoped_ptr<ArcOptInManager> arc_opt_in_manager_;
+
   // Individual services
   scoped_ptr<ArcAuthService> arc_auth_service_;
   scoped_ptr<ArcClipboardBridge> arc_clipboard_bridge_;