Refactor CryptAuth component to be more testable.

chrome/browser/signin/easy_unlock_service_regular.cc

 // Copyright 2014 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/signin/easy_unlock_service_regular.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/screenlock_bridge.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/api/easy_unlock_private.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/login/user_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#include "components/proximity_auth/cryptauth/cryptauth_account_token_fetcher.h"
+#include "components/proximity_auth/cryptauth/cryptauth_access_token_fetcher.h"
 #include "components/proximity_auth/cryptauth/cryptauth_client.h"
 #include "components/proximity_auth/cryptauth/cryptauth_client_factory.h"
 #include "components/proximity_auth/switches.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/constants.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 180 matching lines @@
 #endif
 }
 
 void EasyUnlockServiceRegular::RunTurnOffFlow() {
   if (turn_off_flow_status_ == PENDING)
     return;
   DCHECK(!cryptauth_client_);
 
   SetTurnOffFlowStatus(PENDING);
 
-  proximity_auth::CryptAuthClientFactory factory(
+  auto factory = proximity_auth::CryptAuthClientFactory::CreateDefault(
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile()),
       SigninManagerFactory::GetForProfile(profile())
           ->GetAuthenticatedAccountId(),
       profile()->GetRequestContext(), GetDeviceClassifier());
-  cryptauth_client_ = factory.CreateInstance();
+  cryptauth_client_ = factory->CreateInstance();
 
   cryptauth::ToggleEasyUnlockRequest request;
   request.set_enable(false);
   request.set_apply_to_all(true);
   cryptauth_client_->ToggleEasyUnlock(
       request,
       base::Bind(&EasyUnlockServiceRegular::OnToggleEasyUnlockApiComplete,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&EasyUnlockServiceRegular::OnToggleEasyUnlockApiFailed,
                  weak_ptr_factory_.GetWeakPtr()));
@@ skipping 185 matching lines @@
       new base::DictionaryValue());
   user_prefs_dict->SetBooleanWithoutPathExpansion(
       prefs::kEasyUnlockProximityRequired,
       profile_prefs->GetBoolean(prefs::kEasyUnlockProximityRequired));
 
   DictionaryPrefUpdate update(local_state,
                               prefs::kEasyUnlockLocalStateUserPrefs);
   std::string user_email = GetUserEmail();
   update->SetWithoutPathExpansion(user_email, user_prefs_dict.Pass());
 }