Split ArcSessionManager from ArcAuthService.

Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
TBR=stevenjb@chromium.org

Committed: https://crrev.com/5d94408675c787c6be6e1c7129d3180d9ca7786a
Cr-Commit-Position: refs/heads/master@{#433131}

[hidehiko, 2016-11-16 15:48:44]

Description was changed from

==========
Rename ArcAuthService into ArcSessionManager.

BUG=
==========

to

==========
Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
==========

[hidehiko, 2016-11-16 15:52:22]

Patchset #2 (id:20001) has been deleted

[hidehiko, 2016-11-16 16:17:24]

hidehiko@chromium.org changed reviewers:
+ afakhry@chromium.org, bartfab@chromium.org, bauerb@chromium.org,
benwells@chromium.org, derat@chromium.org, isherman@chromium.org,
lhchavez@chromium.org, maxbogue@chromium.org, xiyuan@chromium.org

[hidehiko, 2016-11-16 16:17:25]

PTAL:

lhchavez@: Overall code change, specifically c/b/c/arc.
xiyuan@: c/b/c/... (except c/b/c/arc), c/b/ui/app_list/, c/b/ui/webui/.
afakhry@: c/b/extensions/api/feedback_private/
isherman@: c/b/metrics/
bartfab@: c/b/policy/
bauerb@: c/b/prefs/
maxbogue@: c/b/sync/
derat@: c/b/ui/ash/
benwells@: c/b/ui/extensions/, 	c/b/ui/views/apps/, 

Note: This CL touches many files, but mostly (except files under c/b/c/arc/...)
it is just renaming (ArcAuthService -> ArcSessionManager, and its related
variable names). PS1 is actually just renaming.

Luis, the diff between PS1 and PS2 illustrates the actually split.
The reason I don't split this CL into two is tracking on git.

Thank you all for your review in advance!
- hidehiko

[Daniel Erat, 2016-11-16 16:24:35]

lgtm for c/b/ui/ash/

[Bernhard Bauer, 2016-11-16 16:32:27]

prefs/ LGTM.

[bartfab (slow), 2016-11-16 16:44:40]

c/b/policy LGTM

[Luis Héctor Chávez, 2016-11-16 17:13:34]

(+768 lines, -2679 lines) This is amazing!

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_auth_service.cc (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_auth_service.cc:248: if (support_host) {
What happens if this is not available? Wouldn't ARC be permanently unable to
start / proceed until session is terminated + restarted?

Please add a comment otherwise.

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_auth_service.cc:312: DCHECK(support_host);
Please mention this is a callback from the SupportHost and this *must* be valid
(as opposed to L248 where there is a possibility where it is not available).

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_service_launcher.h (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_service_launcher.h:15: class ArcSessionManager;
Seems like we don't need this in this file. Is it possible to move it to the .h
files where it is actually needed?

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_session_manager.h (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_session_manager.h:202: ArcSupportHost*
support_host() { return support_host_.get(); }
nit: I missed this earlier, but you can make this

ArcSupportHost* support_host() const { ... }

same below.

[afakhry, 2016-11-16 17:16:06]

feedback_private_api.cc lgtm

[maxbogue, 2016-11-16 17:36:48]

c/b/sync lgtm

[xiyuan, 2016-11-16 18:35:10]

xiyuan@chromium.org changed reviewers:
+ khmel@chromium.org

[xiyuan, 2016-11-16 18:35:11]

+khmel in case he is interested

[xiyuan, 2016-11-16 18:55:53]

lgtm

c/b/c/... (except c/b/c/arc),
c/b/ui/app_list/,
c/b/ui/webui/

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_auth_service.cc (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_auth_service.cc:133: DCHECK(g_arc_auth_service
== this);
nit: DCHECK_EQ(this, g_arc_auth_service);

[hidehiko, 2016-11-16 19:52:05]

Thank you for review. Luis, PTAL.

> +khmel in case he is interested
Oops!! I mistakenly drop him from CC list, maybe while I built the long R list.
Thank you for the support.

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_auth_service.cc (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_auth_service.cc:133: DCHECK(g_arc_auth_service
== this);
On 2016/11/16 18:55:52, xiyuan wrote:
> nit: DCHECK_EQ(this, g_arc_auth_service);

Done.

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_auth_service.cc:248: if (support_host) {
On 2016/11/16 17:13:34, Luis Héctor Chávez wrote:
> What happens if this is not available? Wouldn't ARC be permanently unable to
> start / proceed until session is terminated + restarted?
> 
> Please add a comment otherwise.

Oh, good point. I re-check this and it turned out that support_host should be
available always here. Commented and replaced by DCHECK.

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_auth_service.cc:312: DCHECK(support_host);
On 2016/11/16 17:13:34, Luis Héctor Chávez wrote:
> Please mention this is a callback from the SupportHost and this *must* be
valid
> (as opposed to L248 where there is a possibility where it is not available).

Done.

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_service_launcher.h (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_service_launcher.h:15: class ArcSessionManager;
On 2016/11/16 17:13:34, Luis Héctor Chávez wrote:
> Seems like we don't need this in this file. Is it possible to move it to the
.h
> files where it is actually needed?

Oops. This was just my mistake. Removed.

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_session_manager.h (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_session_manager.h:202: ArcSupportHost*
support_host() { return support_host_.get(); }
On 2016/11/16 17:13:34, Luis Héctor Chávez wrote:
> nit: I missed this earlier, but you can make this
> 
> ArcSupportHost* support_host() const { ... }
> 
> same below.

As ArcSupportHost, which is owned by ArcSessionManager, is mutable, I think it's
better not to mark const here. We actually do similar thing for Profile above
(non-const for Profile*, and const for const Profile*).

WDYT?

[benwells, 2016-11-16 22:52:43]

lgtm

[Luis Héctor Chávez, 2016-11-16 23:03:31]

lgtm

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
File chrome/browser/chromeos/arc/arc_session_manager.h (right):

https://codereview.chromium.org/2507073002/diff/40001/chrome/browser/chromeos...
chrome/browser/chromeos/arc/arc_session_manager.h:202: ArcSupportHost*
support_host() { return support_host_.get(); }
On 2016/11/16 19:52:05, hidehiko wrote:
> On 2016/11/16 17:13:34, Luis Héctor Chávez wrote:
> > nit: I missed this earlier, but you can make this
> > 
> > ArcSupportHost* support_host() const { ... }
> > 
> > same below.
> 
> As ArcSupportHost, which is owned by ArcSessionManager, is mutable, I think
it's
> better not to mark const here. We actually do similar thing for Profile above
> (non-const for Profile*, and const for const Profile*).
> 
> WDYT?

I guess it's ok to keep it non-const.

[Ilya Sherman, 2016-11-16 23:03:48]

//chrome/browser/metrics lgtm, and feel free to TBR owners for such a change in
the future, as long as someone familiar with the meaningful code that's changing
has looked at the file.

[hidehiko, 2016-11-17 16:46:54]

Thank you for review, all!

> //chrome/browser/metrics lgtm, and feel free to TBR owners for such a change
in
the future, as long as someone familiar with the meaningful code that's changing
has looked at the file.

Thank you for advise. I'll do it in next time.

Submitting.

[hidehiko, 2016-11-17 16:47:04]

The CQ bit was checked by hidehiko@chromium.org

[hidehiko, 2016-11-17 16:47:05]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org,
bartfab@chromium.org, derat@chromium.org, xiyuan@chromium.org,
afakhry@chromium.org, maxbogue@chromium.org, benwells@chromium.org,
lhchavez@chromium.org, isherman@chromium.org
Link to the patchset: https://codereview.chromium.org/2507073002/#ps80001
(title: "rebase")

[commit-bot: I haz the power, 2016-11-17 16:47:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-17 16:51:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-17 16:51:55]

Try jobs failed on following builders:
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[hidehiko, 2016-11-17 17:08:12]

The CQ bit was checked by hidehiko@chromium.org

[hidehiko, 2016-11-17 17:08:13]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org,
bartfab@chromium.org, benwells@chromium.org, derat@chromium.org,
xiyuan@chromium.org, lhchavez@chromium.org, afakhry@chromium.org,
maxbogue@chromium.org, isherman@chromium.org
Link to the patchset: https://codereview.chromium.org/2507073002/#ps100001
(title: "rebase")

[commit-bot: I haz the power, 2016-11-17 17:08:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-17 17:20:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-17 17:20:49]

Try jobs failed on following builders:
  linux_chromium_compile_dbg_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[hidehiko, 2016-11-17 18:10:30]

The CQ bit was checked by hidehiko@chromium.org

[hidehiko, 2016-11-17 18:10:31]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org,
bartfab@chromium.org, benwells@chromium.org, derat@chromium.org,
xiyuan@chromium.org, lhchavez@chromium.org, afakhry@chromium.org,
maxbogue@chromium.org, isherman@chromium.org
Link to the patchset: https://codereview.chromium.org/2507073002/#ps120001
(title: "rebase")

[commit-bot: I haz the power, 2016-11-17 18:11:29]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-17 18:26:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-17 18:26:33]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[hidehiko, 2016-11-18 00:59:26]

Description was changed from

==========
Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
==========

to

==========
Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
TBR=stevenjb@chromium.org
==========

[hidehiko, 2016-11-18 01:00:07]

Oops, I overlooked c/b/ui/webui/options/OWNERS has setnoparent... Added
stevenjb@chromium.org to R and TBR.

[hidehiko, 2016-11-18 01:00:15]

The CQ bit was checked by hidehiko@chromium.org

[hidehiko, 2016-11-18 01:00:43]

hidehiko@chromium.org changed reviewers:
+ stevenjb@chromium.org

[commit-bot: I haz the power, 2016-11-18 01:03:12]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-18 03:12:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-18 03:12:14]

Failed to apply patch for chrome/browser/chromeos/arc/arc_session_manager.cc:
While running git apply --index -p1;
  error: patch failed: chrome/browser/chromeos/arc/arc_auth_service.cc:339
  error: chrome/browser/chromeos/arc/arc_auth_service.cc: patch does not apply

Patch:   NR 
chrome/browser/chromeos/arc/arc_auth_service.cc->chrome/browser/chromeos/arc/arc_session_manager.cc
Index: chrome/browser/chromeos/arc/arc_session_manager.cc
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc
b/chrome/browser/chromeos/arc/arc_session_manager.cc
similarity index 65%
copy from chrome/browser/chromeos/arc/arc_auth_service.cc
copy to chrome/browser/chromeos/arc/arc_session_manager.cc
index
37ffd78319836671ddfdb8ccfae8c5033f296c97..21effca88e1741d7f087ae3c547c954e774f4945
100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -1,8 +1,8 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 
 #include <utility>
 
@@ -50,10 +50,8 @@ namespace arc {
 
 namespace {
 
-constexpr size_t kMinVersionForOnAccountInfoReady = 5;
-
 // Weak pointer.  This class is owned by ArcServiceManager.
-ArcAuthService* g_arc_auth_service = nullptr;
+ArcSessionManager* g_arc_session_manager = nullptr;
 
 // Skip creating UI in unit tests
 bool g_disable_ui_for_testing = false;
@@ -80,134 +78,35 @@ ash::ShelfDelegate* GetShelfDelegate() {
   return nullptr;
 }
 
-ProvisioningResult ConvertArcSignInFailureReasonToProvisioningResult(
-    mojom::ArcSignInFailureReason reason) {
-  using ArcSignInFailureReason = mojom::ArcSignInFailureReason;
-
-#define MAP_PROVISIONING_RESULT(name) \
-  case ArcSignInFailureReason::name:  \
-    return ProvisioningResult::name
-
-  switch (reason) {
-    MAP_PROVISIONING_RESULT(UNKNOWN_ERROR);
-    MAP_PROVISIONING_RESULT(MOJO_VERSION_MISMATCH);
-    MAP_PROVISIONING_RESULT(MOJO_CALL_TIMEOUT);
-    MAP_PROVISIONING_RESULT(DEVICE_CHECK_IN_FAILED);
-    MAP_PROVISIONING_RESULT(DEVICE_CHECK_IN_TIMEOUT);
-    MAP_PROVISIONING_RESULT(DEVICE_CHECK_IN_INTERNAL_ERROR);
-    MAP_PROVISIONING_RESULT(GMS_NETWORK_ERROR);
-    MAP_PROVISIONING_RESULT(GMS_SERVICE_UNAVAILABLE);
-    MAP_PROVISIONING_RESULT(GMS_BAD_AUTHENTICATION);
-    MAP_PROVISIONING_RESULT(GMS_SIGN_IN_FAILED);
-    MAP_PROVISIONING_RESULT(GMS_SIGN_IN_TIMEOUT);
-    MAP_PROVISIONING_RESULT(GMS_SIGN_IN_INTERNAL_ERROR);
-    MAP_PROVISIONING_RESULT(CLOUD_PROVISION_FLOW_FAILED);
-    MAP_PROVISIONING_RESULT(CLOUD_PROVISION_FLOW_TIMEOUT);
-    MAP_PROVISIONING_RESULT(CLOUD_PROVISION_FLOW_INTERNAL_ERROR);
-  }
-#undef MAP_PROVISIONING_RESULT
-
-  NOTREACHED() << "unknown reason: " << static_cast<int>(reason);
-  return ProvisioningResult::UNKNOWN_ERROR;
-}
-
-bool IsArcKioskMode() {
-  return user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp();
-}
-
-mojom::ChromeAccountType GetAccountType() {
-  if (IsArcKioskMode())
-    return mojom::ChromeAccountType::ROBOT_ACCOUNT;
-  return mojom::ChromeAccountType::USER_ACCOUNT;
-}
-
 }  // namespace
 
-// TODO(lhchavez): Get rid of this class once we can safely remove all the
-// deprecated interfaces and only need to care about one type of callback.
-class ArcAuthService::AccountInfoNotifier {
- public:
-  explicit AccountInfoNotifier(
-      const GetAuthCodeDeprecatedCallback& auth_callback)
-      : callback_type_(CallbackType::AUTH_CODE),
-        auth_callback_(auth_callback) {}
-
-  explicit AccountInfoNotifier(
-      const GetAuthCodeAndAccountTypeDeprecatedCallback& auth_account_callback)
-      : callback_type_(CallbackType::AUTH_CODE_AND_ACCOUNT),
-        auth_account_callback_(auth_account_callback) {}
-
-  explicit AccountInfoNotifier(const AccountInfoCallback&
account_info_callback)
-      : callback_type_(CallbackType::ACCOUNT_INFO),
-        account_info_callback_(account_info_callback) {}
-
-  void Notify(bool is_enforced,
-              const std::string& auth_code,
-              mojom::ChromeAccountType account_type,
-              bool is_managed) {
-    switch (callback_type_) {
-      case CallbackType::AUTH_CODE:
-        DCHECK(!auth_callback_.is_null());
-        auth_callback_.Run(auth_code, is_enforced);
-        break;
-      case CallbackType::AUTH_CODE_AND_ACCOUNT:
-        DCHECK(!auth_account_callback_.is_null());
-        auth_account_callback_.Run(auth_code, is_enforced, account_type);
-        break;
-      case CallbackType::ACCOUNT_INFO:
-        DCHECK(!account_info_callback_.is_null());
-        mojom::AccountInfoPtr account_info = mojom::AccountInfo::New();
-        if (!is_enforced) {
-          account_info->auth_code = base::nullopt;
-        } else {
-          account_info->auth_code = auth_code;
-        }
-        account_info->account_type = account_type;
-        account_info->is_managed = is_managed;
-        account_info_callback_.Run(std::move(account_info));
-        break;
-    }
-  }
-
- private:
-  enum class CallbackType { AUTH_CODE, AUTH_CODE_AND_ACCOUNT, ACCOUNT_INFO };
-
-  const CallbackType callback_type_;
-  const GetAuthCodeDeprecatedCallback auth_callback_;
-  const GetAuthCodeAndAccountTypeDeprecatedCallback auth_account_callback_;
-  const AccountInfoCallback account_info_callback_;
-};
-
-ArcAuthService::ArcAuthService(ArcBridgeService* bridge_service)
-    : ArcService(bridge_service), binding_(this), weak_ptr_factory_(this) {
+ArcSessionManager::ArcSessionManager(ArcBridgeService* bridge_service)
+    : ArcService(bridge_service), weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DCHECK(!g_arc_auth_service);
-
-  g_arc_auth_service = this;
+  DCHECK(!g_arc_session_manager);
+  g_arc_session_manager = this;
 
   arc_bridge_service()->AddObserver(this);
-  arc_bridge_service()->auth()->AddObserver(this);
 }
 
-ArcAuthService::~ArcAuthService() {
+ArcSessionManager::~ArcSessionManager() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DCHECK_EQ(this, g_arc_auth_service);
 
   Shutdown();
-  arc_bridge_service()->auth()->RemoveObserver(this);
   arc_bridge_service()->RemoveObserver(this);
 
-  g_arc_auth_service = nullptr;
+  DCHECK_EQ(this, g_arc_session_manager);
+  g_arc_session_manager = nullptr;
 }
 
 // static
-ArcAuthService* ArcAuthService::Get() {
+ArcSessionManager* ArcSessionManager::Get() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  return g_arc_auth_service;
+  return g_arc_session_manager;
 }
 
 // static
-void ArcAuthService::RegisterProfilePrefs(
+void ArcSessionManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   // TODO(dspaid): Implement a mechanism to allow this to sync on first boot
   // only.
@@ -219,29 +118,29 @@ void ArcAuthService::RegisterProfilePrefs(
 }
 
 // static
-void ArcAuthService::DisableUIForTesting() {
+void ArcSessionManager::DisableUIForTesting() {
   g_disable_ui_for_testing = true;
 }
 
 // static
-void ArcAuthService::SetShelfDelegateForTesting(
+void ArcSessionManager::SetShelfDelegateForTesting(
     ash::ShelfDelegate* shelf_delegate) {
   g_shelf_delegate_for_testing = shelf_delegate;
 }
 
 // static
-bool ArcAuthService::IsOptInVerificationDisabled() {
+bool ArcSessionManager::IsOptInVerificationDisabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kDisableArcOptInVerification);
 }
 
 // static
-void ArcAuthService::EnableCheckAndroidManagementForTesting() {
+void ArcSessionManager::EnableCheckAndroidManagementForTesting() {
   g_enable_check_android_management_for_testing = true;
 }
 
 // static
-bool ArcAuthService::IsAllowedForProfile(const Profile* profile) {
+bool ArcSessionManager::IsAllowedForProfile(const Profile* profile) {
   if (!ArcBridgeService::GetEnabled(base::CommandLine::ForCurrentProcess())) {
     VLOG(1) << "Arc is not enabled.";
     return false;
@@ -278,13 +177,12 @@ bool ArcAuthService::IsAllowedForProfile(const Profile*
profile) {
   return true;
 }
 
-void ArcAuthService::OnInstanceReady() {
-  auto* instance = arc_bridge_service()->auth()->GetInstanceForMethod("Init");
-  DCHECK(instance);
-  instance->Init(binding_.CreateInterfacePtrAndBind());
+// static
+bool ArcSessionManager::IsArcKioskMode() {
+  return user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp();
 }
 
-void ArcAuthService::OnBridgeStopped(ArcBridgeService::StopReason reason) {
+void ArcSessionManager::OnBridgeStopped(ArcBridgeService::StopReason reason) {
   // TODO(crbug.com/625923): Use |reason| to report more detailed errors.
   if (arc_sign_in_timer_.IsRunning()) {
     OnProvisioningFinished(ProvisioningResult::ARC_STOPPED);
@@ -301,12 +199,12 @@ void
ArcAuthService::OnBridgeStopped(ArcBridgeService::StopReason reason) {
     // done.
     // TODO(hidehiko): Restructure the code. crbug.com/665316
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&ArcAuthService::OnArcDataRemoved,
+        FROM_HERE, base::Bind(&ArcSessionManager::OnArcDataRemoved,
                               weak_ptr_factory_.GetWeakPtr(), true));
   }
 }
 
-void ArcAuthService::RemoveArcData() {
+void ArcSessionManager::RemoveArcData() {
   if (!arc_bridge_service()->stopped()) {
     // Just set a flag. On bridge stopped, this will be re-called,
     // then session manager should remove the data.
@@ -317,11 +215,11 @@ void ArcAuthService::RemoveArcData() {
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->RemoveArcData(
       cryptohome::Identification(
           multi_user_util::GetAccountIdFromProfile(profile_)),
-      base::Bind(&ArcAuthService::OnArcDataRemoved,
+      base::Bind(&ArcSessionManager::OnArcDataRemoved,
                  weak_ptr_factor…
(message too large)

[hidehiko, 2016-11-18 04:57:30]

Rebased again. Trying to land.

[hidehiko, 2016-11-18 04:57:37]

The CQ bit was checked by hidehiko@chromium.org

[hidehiko, 2016-11-18 04:57:38]

The patchset sent to the CQ was uploaded after l-g-t-m from bauerb@chromium.org,
bartfab@chromium.org, benwells@chromium.org, derat@chromium.org,
xiyuan@chromium.org, lhchavez@chromium.org, afakhry@chromium.org,
maxbogue@chromium.org, isherman@chromium.org
Link to the patchset: https://codereview.chromium.org/2507073002/#ps160001
(title: "Fix rebase mistake")

[commit-bot: I haz the power, 2016-11-18 04:57:59]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-18 06:17:45]

Description was changed from

==========
Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
TBR=stevenjb@chromium.org
==========

to

==========
Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
TBR=stevenjb@chromium.org
==========

[commit-bot: I haz the power, 2016-11-18 06:17:47]

Committed patchset #8 (id:160001)

[commit-bot: I haz the power, 2016-11-18 06:19:40]

Description was changed from

==========
Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
TBR=stevenjb@chromium.org
==========

to

==========
Split ArcSessionManager from ArcAuthService.

ArcAuthService has multiple responsibility.
Specifically, handling on ARC boot-phase proceder and
AuthHost implementation should be independent.

This CL extracts everything other than AuthHost implementation
into another class, named ArcSessionManager.

BUG=657687
BUG=b/31079732
TEST=Ran on test device. Ran bots.
TBR=stevenjb@chromium.org

Committed: https://crrev.com/5d94408675c787c6be6e1c7129d3180d9ca7786a
Cr-Commit-Position: refs/heads/master@{#433131}
==========

[commit-bot: I haz the power, 2016-11-18 06:19:42]

Patchset 8 (id:??) landed as
https://crrev.com/5d94408675c787c6be6e1c7129d3180d9ca7786a
Cr-Commit-Position: refs/heads/master@{#433131}