[ARC] Add browser test of ArcAuthService

chrome/browser/chromeos/arc/arc_auth_service.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 "chrome/browser/chromeos/arc/arc_auth_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 11 matching lines @@
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_features.h"
 #include "components/arc/arc_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace arc {
 namespace {
 
-ArcAuthService* g_arc_auth_service = nullptr;
-
 // Convers mojom::ArcSignInFailureReason into ProvisiningResult.
 ProvisioningResult ConvertArcSignInFailureReasonToProvisioningResult(
     mojom::ArcSignInFailureReason reason) {
   using ArcSignInFailureReason = mojom::ArcSignInFailureReason;
 
 #define MAP_PROVISIONING_RESULT(name) \
   case ArcSignInFailureReason::name:  \
     return ProvisioningResult::name
 
   switch (reason) {
@@ skipping 20 matching lines @@
   return ProvisioningResult::UNKNOWN_ERROR;
 }
 
 mojom::ChromeAccountType GetAccountType() {
   return IsArcKioskMode() ? mojom::ChromeAccountType::ROBOT_ACCOUNT
                           : mojom::ChromeAccountType::USER_ACCOUNT;
 }
 
 }  // namespace
 
+// static
+const char ArcAuthService::kArcServiceName[] = "arc::ArcAuthService";
+
 // 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(
@@ skipping 43 matching lines @@
   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) {
-  DCHECK(!g_arc_auth_service);
-  g_arc_auth_service = this;
   arc_bridge_service()->auth()->AddObserver(this);
 }
 
 ArcAuthService::~ArcAuthService() {
   arc_bridge_service()->auth()->RemoveObserver(this);
-
-  DCHECK_EQ(g_arc_auth_service, this);
-  g_arc_auth_service = nullptr;
-}
-
-// static
-ArcAuthService* ArcAuthService::GetForTest() {
-  DCHECK(g_arc_auth_service);
-  return g_arc_auth_service;
 }
 
 void ArcAuthService::OnInstanceReady() {
   auto* instance =
       ARC_GET_INSTANCE_FOR_METHOD(arc_bridge_service()->auth(), Init);
   DCHECK(instance);
   instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
 void ArcAuthService::OnInstanceClosed() {
@@ skipping 196 matching lines @@
 
   notifier_->Notify(
       !IsArcOptInVerificationDisabled(), auth_code,
       ArcSessionManager::Get()->auth_context()->full_account_id(),
       GetAccountType(),
       policy_util::IsAccountManaged(ArcSessionManager::Get()->profile()));
   notifier_.reset();
 }
 
 }  // namespace arc