[Sync] Fix sync backup for supervised users

chrome/browser/supervised_user/supervised_user_service.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/supervised_user/supervised_user_service.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
@@ skipping 386 matching lines @@
   result.Put(syncer::SESSIONS);
   result.Put(syncer::EXTENSIONS);
   result.Put(syncer::EXTENSION_SETTINGS);
   result.Put(syncer::APPS);
   result.Put(syncer::APP_SETTINGS);
   result.Put(syncer::APP_NOTIFICATIONS);
   result.Put(syncer::APP_LIST);
   return result;
 }
 
 void SupervisedUserService::OnStateChanged() {

[Marc Treib, 2014/09/26 08:42:38]

This does get called when the backend_mode changes, right?
If so, can you please update the comment at
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/syn...
?

[Nicolas Zea, 2014/09/26 17:09:22]

It does. And it looks like that comment is quite out of date. I'd like to do an
audit of all the NotifyObservers callsites separately, and update the comment
based on that. Filed crbug.com/418140 for that.

   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
-  if (waiting_for_sync_initialization_ && service->sync_initialized()) {
+  if (waiting_for_sync_initialization_ && service->sync_initialized() &&
+      service->backend_mode() == ProfileSyncService::SYNC) {
     waiting_for_sync_initialization_ = false;
     service->RemoveObserver(this);
     FinishSetupSync();
     return;
   }
 
   DLOG_IF(ERROR, service->GetAuthError().state() ==
                      GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS)
       << "Credentials rejected";
 }
@@ skipping 10 matching lines @@
 }
 
 void SupervisedUserService::FinishSetupSyncWhenReady() {
   // If we're already waiting for the Sync backend, there's nothing to do here.
   if (waiting_for_sync_initialization_)
     return;
 
   // Continue in FinishSetupSync() once the Sync backend has been initialized.
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
-  if (service->sync_initialized()) {
+  if (service->sync_initialized() &&
+      service->backend_mode() == ProfileSyncService::SYNC) {
     FinishSetupSync();
   } else {
     service->AddObserver(this);
     waiting_for_sync_initialization_ = true;
   }
 }
 
 void SupervisedUserService::FinishSetupSync() {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
-  DCHECK(service->sync_initialized());
+  DCHECK(service->sync_initialized() &&

[Marc Treib, 2014/09/26 08:42:38]

Hm, so the underlying problem was that sync_initialized() alone doesn't any
longer mean that we may call OnUserChoseDatatypes/SetSyncSetupCompleted? Maybe
this should be exposed via some "bool PSS::IsReadyForAction()", and mentioned in
the comment for sync_initialized? It seems like more users of the PSS might trip
over that.

[Nicolas Zea, 2014/09/26 17:09:22]

Yeah, I agree this is confusing. For now, since this patch needs to be merged,
I'd like to minimize the changes in other areas. Filed crbug.com/418141

+         service->backend_mode() == ProfileSyncService::SYNC);
 
   // Sync nothing (except types which are set via GetPreferredDataTypes).
   bool sync_everything = false;
   syncer::ModelTypeSet synced_datatypes;
   service->OnUserChoseDatatypes(sync_everything, synced_datatypes);
 
   // Notify ProfileSyncService that we are done with configuration.
   service->SetSetupInProgress(false);
   service->SetSyncSetupCompleted();
 }
@@ skipping 407 matching lines @@
   // The active user can be NULL in unit tests.
   if (user_manager::UserManager::Get()->GetActiveUser()) {
     return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName(
         user_manager::UserManager::Get()->GetActiveUser()->GetUserID()));
   }
   return std::string();
 #else
   return profile_->GetPrefs()->GetString(prefs::kProfileName);
 #endif
 }