Hook up CryptAuthGCMManager to the enrollment and device sync managers.

components/proximity_auth/cryptauth/cryptauth_enrollment_manager.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 "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/clock.h"
 #include "base/time/time.h"
@@ skipping 23 matching lines @@
 const double kEnrollmentMaxJitterRatio = 0.2;
 
 }  // namespace
 
 CryptAuthEnrollmentManager::CryptAuthEnrollmentManager(
     scoped_ptr<base::Clock> clock,
     scoped_ptr<CryptAuthEnrollerFactory> enroller_factory,
     const std::string& user_public_key,
     const std::string& user_private_key,
     const cryptauth::GcmDeviceInfo& device_info,
+    CryptAuthGCMManager* gcm_manager,
     PrefService* pref_service)
     : clock_(clock.Pass()),
       enroller_factory_(enroller_factory.Pass()),
       user_public_key_(user_public_key),
       user_private_key_(user_private_key),
       device_info_(device_info),
+      gcm_manager_(gcm_manager),
       pref_service_(pref_service),
-      weak_ptr_factory_(this) {
-}
+      weak_ptr_factory_(this) {}
 
 CryptAuthEnrollmentManager::~CryptAuthEnrollmentManager() {
+  gcm_manager_->RemoveObserver(this);
 }
 
 // static
 void CryptAuthEnrollmentManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kCryptAuthEnrollmentIsRecoveringFromFailure, false);
   registry->RegisterDoublePref(
       prefs::kCryptAuthEnrollmentLastEnrollmentTimeSeconds, 0.0);
   registry->RegisterIntegerPref(prefs::kCryptAuthEnrollmentReason,
                                 cryptauth::INVOCATION_REASON_UNKNOWN);
 }
 
 void CryptAuthEnrollmentManager::Start() {
+  gcm_manager_->AddObserver(this);
+
   bool is_recovering_from_failure =
       pref_service_->GetBoolean(
           prefs::kCryptAuthEnrollmentIsRecoveringFromFailure) ||
       !IsEnrollmentValid();
 
   base::Time last_successful_enrollment = GetLastEnrollmentTime();
   base::TimeDelta elapsed_time_since_last_sync =
       clock_->Now() - last_successful_enrollment;
 
   scheduler_ = CreateSyncScheduler();
@@ skipping 65 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_, OnEnrollmentFinished(success));
 }
 
 scoped_ptr<SyncScheduler> CryptAuthEnrollmentManager::CreateSyncScheduler() {
   return make_scoped_ptr(new SyncSchedulerImpl(
       this, base::TimeDelta::FromDays(kEnrollmentRefreshPeriodDays),
       base::TimeDelta::FromMinutes(kEnrollmentBaseRecoveryPeriodMinutes),
       kEnrollmentMaxJitterRatio, "CryptAuth Enrollment"));
 }
 
+void CryptAuthEnrollmentManager::OnGCMRegistrationResult(bool success) {
+  if (!sync_request_)
+    return;
+
+  PA_LOG(INFO) << "GCM registration for CryptAuth Enrollment completed: "
+               << success;
+  if (success)
+    DoCryptAuthEnrollment();
+  else
+    OnEnrollmentFinished(false);
+}
+
+void CryptAuthEnrollmentManager::OnReenrollMessage() {
+  ForceEnrollmentNow(cryptauth::INVOCATION_REASON_SERVER_INITIATED);
+}
+
 void CryptAuthEnrollmentManager::OnSyncRequested(
     scoped_ptr<SyncScheduler::SyncRequest> sync_request) {
   FOR_EACH_OBSERVER(Observer, observers_, OnEnrollmentStarted());
 
   sync_request_ = sync_request.Pass();
-  cryptauth_enroller_ = enroller_factory_->CreateInstance();
 
+  if (gcm_manager_->GetRegistrationId().empty()) {
+    gcm_manager_->RegisterWithGCM();
+  } else {
+    DoCryptAuthEnrollment();
+  }
+}
+
+void CryptAuthEnrollmentManager::DoCryptAuthEnrollment() {
+  DCHECK(sync_request_);
   cryptauth::InvocationReason invocation_reason =
       cryptauth::INVOCATION_REASON_UNKNOWN;
 
   int reason_stored_in_prefs =
       pref_service_->GetInteger(prefs::kCryptAuthEnrollmentReason);
 
   if (cryptauth::InvocationReason_IsValid(reason_stored_in_prefs) &&
       reason_stored_in_prefs != cryptauth::INVOCATION_REASON_UNKNOWN) {
     invocation_reason =
         static_cast<cryptauth::InvocationReason>(reason_stored_in_prefs);
   } else if (GetLastEnrollmentTime().is_null()) {
     invocation_reason = cryptauth::INVOCATION_REASON_INITIALIZATION;
   } else if (!IsEnrollmentValid()) {
     invocation_reason = cryptauth::INVOCATION_REASON_EXPIRATION;
   } else if (scheduler_->GetStrategy() ==
              SyncScheduler::Strategy::PERIODIC_REFRESH) {
     invocation_reason = cryptauth::INVOCATION_REASON_PERIODIC;
   } else if (scheduler_->GetStrategy() ==
              SyncScheduler::Strategy::AGGRESSIVE_RECOVERY) {
     invocation_reason = cryptauth::INVOCATION_REASON_FAILURE_RECOVERY;
   }
 
   PA_LOG(INFO) << "Making enrollment with reason: " << invocation_reason;
+  cryptauth_enroller_ = enroller_factory_->CreateInstance();
   cryptauth_enroller_->Enroll(
       user_public_key_, user_private_key_, device_info_, invocation_reason,
       base::Bind(&CryptAuthEnrollmentManager::OnEnrollmentFinished,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 }  // namespace proximity_auth