#include <cstddef>
#include <iterator>
#include <ostream>
-#include <set>
#include <sstream>
#include <vector>
-#include "base/base64.h"
-#include "base/bind.h"
-#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/json/json_writer.h"
-#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/stringprintf.h"
#include "base/timer/timer.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/invalidation/p2p_invalidation_service.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/profile_oauth2_token_service.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_manager_base.h"
#include "chrome/browser/sync/about_sync_util.h"
-#include "chrome/browser/sync/backend_migrator.h"
-#include "chrome/browser/sync/glue/data_type_controller.h"
+#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/sync/test/integration/status_change_checker.h"
+#include "chrome/browser/sync/test/integration/quiesce_status_change_checker.h"
+#include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
-#include "content/public/browser/notification_service.h"
+#include "components/invalidation/p2p_invalidation_service.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
+#include "components/signin/core/browser/signin_manager_base.h"
+#include "components/sync_driver/data_type_controller.h"
#include "google_apis/gaia/gaia_constants.h"
#include "sync/internal_api/public/base/progress_marker_map.h"
-#include "sync/internal_api/public/sessions/sync_session_snapshot.h"
#include "sync/internal_api/public/util/sync_string_conversions.h"
#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/managed_mode/managed_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
#endif
using syncer::sessions::SyncSessionSnapshot;
-using invalidation::P2PInvalidationService;
-
-// The amount of time for which we wait for a sync operation to complete.
-static const int kSyncOperationTimeoutMs = 45000;
namespace {
-// Checks if a desired change in the state of the sync engine has taken place by
-// running the callback passed to it.
-class CallbackStatusChecker : public StatusChangeChecker {
- public:
- CallbackStatusChecker(base::Callback<bool()> callback,
- const std::string& source)
- : StatusChangeChecker(source),
- callback_(callback) {
- }
+bool HasAuthError(ProfileSyncService* service) {
+ return service->GetAuthError().state() ==
+ GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
+ service->GetAuthError().state() ==
+ GoogleServiceAuthError::SERVICE_ERROR ||
+ service->GetAuthError().state() ==
+ GoogleServiceAuthError::REQUEST_CANCELED;
+}
- virtual ~CallbackStatusChecker() {
- }
+class BackendInitializeChecker : public SingleClientStatusChangeChecker {
+ public:
+ explicit BackendInitializeChecker(ProfileSyncService* service)
+ : SingleClientStatusChangeChecker(service) {}
virtual bool IsExitConditionSatisfied() OVERRIDE {
- return callback_.Run();
+ if (service()->backend_mode() != ProfileSyncService::SYNC)
+ return false;
+ if (service()->sync_initialized())
+ return true;
+ // Backend initialization is blocked by an auth error.
+ if (HasAuthError(service()))
+ return true;
+ // Backend initialization is blocked by a failure to fetch Oauth2 tokens.
+ if (service()->IsRetryingAccessTokenFetchForTest())
+ return true;
+ // Still waiting on backend initialization.
+ return false;
}
- private:
- // Callback that evaluates whether the condition we are waiting on has been
- // satisfied.
- base::Callback<bool()> callback_;
-
- DISALLOW_COPY_AND_ASSIGN(CallbackStatusChecker);
+ virtual std::string GetDebugMessage() const OVERRIDE {
+ return "Backend Initialize";
+ }
};
-// Helper function which returns true if the sync backend has been initialized,
-// or if backend initialization was blocked for some reason.
-bool DoneWaitingForBackendInitialization(
- const ProfileSyncServiceHarness* harness) {
- DCHECK(harness);
- // Backend is initialized.
- if (harness->service()->sync_initialized())
- return true;
- // Backend initialization is blocked by an auth error.
- if (harness->HasAuthError())
- return true;
- // Backend initialization is blocked by a failure to fetch Oauth2 tokens.
- if (harness->service()->IsRetryingAccessTokenFetchForTest())
- return true;
- // Still waiting on backend initialization.
- return false;
-}
+class SyncSetupChecker : public SingleClientStatusChangeChecker {
+ public:
+ explicit SyncSetupChecker(ProfileSyncService* service)
+ : SingleClientStatusChangeChecker(service) {}
-// Helper function which returns true if initial sync is complete, or if the
-// initial sync is blocked for some reason.
-bool DoneWaitingForInitialSync(const ProfileSyncServiceHarness* harness) {
- DCHECK(harness);
- // Initial sync is complete.
- if (harness->IsFullySynced())
- return true;
- // Initial sync is blocked because custom passphrase is required.
- if (harness->service()->passphrase_required_reason() ==
- syncer::REASON_DECRYPTION) {
- return true;
+ virtual bool IsExitConditionSatisfied() OVERRIDE {
+ // Sync setup is complete, and the client is ready to sync new changes.
+ if (service()->ShouldPushChanges())
+ return true;
+ // Sync is blocked because a custom passphrase is required.
+ if (service()->passphrase_required_reason() == syncer::REASON_DECRYPTION)
+ return true;
+ // Sync is blocked by an auth error.
+ if (HasAuthError(service()))
+ return true;
+ // Still waiting on sync setup.
+ return false;
}
- // Initial sync is blocked by an auth error.
- if (harness->HasAuthError())
- return true;
- // Still waiting on initial sync.
- return false;
-}
-
-// Helper function which returns true if the sync client is fully synced, or if
-// sync is blocked for some reason.
-bool DoneWaitingForFullSync(const ProfileSyncServiceHarness* harness) {
- DCHECK(harness);
- // Sync is complete.
- if (harness->IsFullySynced())
- return true;
- // Sync is blocked by an auth error.
- if (harness->HasAuthError())
- return true;
- // Sync is blocked by a failure to fetch Oauth2 tokens.
- if (harness->service()->IsRetryingAccessTokenFetchForTest())
- return true;
- // Still waiting on sync.
- return false;
-}
-// Helper function which returns true if the sync client requires a custom
-// passphrase to be entered for decryption.
-bool IsPassphraseRequired(const ProfileSyncServiceHarness* harness) {
- DCHECK(harness);
- return harness->service()->IsPassphraseRequired();
-}
+ virtual std::string GetDebugMessage() const OVERRIDE {
+ return "Sync Setup";
+ }
+};
-// Helper function which returns true if the custom passphrase entered was
-// accepted.
-bool IsPassphraseAccepted(const ProfileSyncServiceHarness* harness) {
- DCHECK(harness);
- return (!harness->service()->IsPassphraseRequired() &&
- harness->service()->IsUsingSecondaryPassphrase());
+bool AwaitSyncSetupCompletion(ProfileSyncService* service) {
+ SyncSetupChecker checker(service);
+ checker.Wait();
+ return !checker.TimedOut();
}
} // namespace
Profile* profile,
const std::string& username,
const std::string& password) {
- return new ProfileSyncServiceHarness(profile, username, password, NULL);
-}
-
-// static
-ProfileSyncServiceHarness* ProfileSyncServiceHarness::CreateForIntegrationTest(
- Profile* profile,
- const std::string& username,
- const std::string& password,
- P2PInvalidationService* p2p_invalidation_service) {
- return new ProfileSyncServiceHarness(profile,
- username,
- password,
- p2p_invalidation_service);
+ return new ProfileSyncServiceHarness(profile, username, password);
}
ProfileSyncServiceHarness::ProfileSyncServiceHarness(
Profile* profile,
const std::string& username,
- const std::string& password,
- P2PInvalidationService* p2p_invalidation_service)
+ const std::string& password)
: profile_(profile),
service_(ProfileSyncServiceFactory::GetForProfile(profile)),
- p2p_invalidation_service_(p2p_invalidation_service),
- progress_marker_partner_(NULL),
username_(username),
password_(password),
oauth2_refesh_token_number_(0),
- profile_debug_name_(profile->GetDebugName()),
- status_change_checker_(NULL) {
+ profile_debug_name_(profile->GetDebugName()) {
}
-ProfileSyncServiceHarness::~ProfileSyncServiceHarness() {
- if (service()->HasObserver(this))
- service()->RemoveObserver(this);
-}
+ProfileSyncServiceHarness::~ProfileSyncServiceHarness() { }
void ProfileSyncServiceHarness::SetCredentials(const std::string& username,
const std::string& password) {
return false;
}
- // Subscribe sync client to notifications from the profile sync service.
- if (!service()->HasObserver(this))
- service()->AddObserver(this);
-
// Tell the sync service that setup is in progress so we don't start syncing
// until we've finished configuration.
service()->SetSetupInProgress(true);
// Authenticate sync client using GAIA credentials.
service()->signin()->SetAuthenticatedUsername(username_);
- profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
- username_);
- GoogleServiceSigninSuccessDetails details(username_, password_);
- content::NotificationService::current()->Notify(
- chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
- content::Source<Profile>(profile_),
- content::Details<const GoogleServiceSigninSuccessDetails>(&details));
+ service()->GoogleSigninSucceeded(username_, password_);
#if defined(ENABLE_MANAGED_USERS)
- std::string account_id = profile_->IsManaged() ?
- managed_users::kManagedUserPseudoEmail : username_;
+ std::string account_id = profile_->IsSupervised() ?
+ supervised_users::kSupervisedUserPseudoEmail : username_;
#else
std::string account_id = username_;
#endif
UpdateCredentials(account_id, GenerateFakeOAuth2RefreshTokenString());
// Wait for the OnBackendInitialized() callback.
- if (!AwaitBackendInitialized()) {
- LOG(ERROR) << "OnBackendInitialized() not seen after "
- << kSyncOperationTimeoutMs / 1000
- << " seconds.";
+ BackendInitializeChecker checker(service());
+ checker.Wait();
+
+ if (checker.TimedOut()) {
+ LOG(ERROR) << "OnBackendInitialized() timed out.";
+ return false;
+ }
+
+ if (!service()->sync_initialized()) {
return false;
}
}
// Make sure that initial sync wasn't blocked by rejected credentials.
- if (HasAuthError()) {
+ if (HasAuthError(service())) {
LOG(ERROR) << "Credentials were rejected. Sync cannot proceed.";
return false;
}
// Wait for initial sync cycle to be completed.
DCHECK(service()->sync_initialized());
- CallbackStatusChecker initial_sync_checker(
- base::Bind(&DoneWaitingForInitialSync, base::Unretained(this)),
- "DoneWaitingForInitialSync");
- if (!AwaitStatusChange(&initial_sync_checker, "SetupSync")) {
- LOG(ERROR) << "Initial sync cycle did not complete after "
- << kSyncOperationTimeoutMs / 1000
- << " seconds.";
+ if (!AwaitSyncSetupCompletion(service())) {
+ LOG(ERROR) << "Initial sync cycle timed out.";
return false;
}
return true;
}
-void ProfileSyncServiceHarness::QuitMessageLoop() {
- base::MessageLoop::current()->QuitWhenIdle();
-}
-
-void ProfileSyncServiceHarness::OnStateChanged() {
- if (!status_change_checker_)
- return;
-
- DVLOG(1) << GetClientInfoString(status_change_checker_->source());
- if (status_change_checker_->IsExitConditionSatisfied())
- QuitMessageLoop();
-}
-
-void ProfileSyncServiceHarness::OnSyncCycleCompleted() {
- // Integration tests still use p2p notifications.
- const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
- bool is_notifiable_commit =
- (snap.model_neutral_state().num_successful_commits > 0);
- if (is_notifiable_commit && p2p_invalidation_service_) {
- syncer::ModelTypeSet model_types =
- snap.model_neutral_state().commit_request_types;
- syncer::ObjectIdSet ids = ModelTypeSetToObjectIdSet(model_types);
- p2p_invalidation_service_->SendInvalidation(ids);
- }
- OnStateChanged();
-}
-
-bool ProfileSyncServiceHarness::AwaitPassphraseRequired() {
- DVLOG(1) << GetClientInfoString("AwaitPassphraseRequired");
- if (IsSyncDisabled()) {
- LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
- return false;
- }
-
- if (service()->IsPassphraseRequired()) {
- // It's already true that a passphrase is required; don't wait.
- return true;
- }
-
- CallbackStatusChecker passphrase_required_checker(
- base::Bind(&::IsPassphraseRequired, base::Unretained(this)),
- "IsPassphraseRequired");
- return AwaitStatusChange(&passphrase_required_checker,
- "AwaitPassphraseRequired");
-}
-
-bool ProfileSyncServiceHarness::AwaitPassphraseAccepted() {
- DVLOG(1) << GetClientInfoString("AwaitPassphraseAccepted");
- if (IsSyncDisabled()) {
- LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
- return false;
- }
-
- if (!service()->IsPassphraseRequired() &&
- service()->IsUsingSecondaryPassphrase()) {
- // Passphrase is already accepted; don't wait.
- FinishSyncSetup();
- return true;
- }
-
- CallbackStatusChecker passphrase_accepted_checker(
- base::Bind(&::IsPassphraseAccepted, base::Unretained(this)),
- "IsPassphraseAccepted");
- bool return_value = AwaitStatusChange(&passphrase_accepted_checker,
- "AwaitPassphraseAccepted");
- if (return_value)
- FinishSyncSetup();
- return return_value;
-}
-
-bool ProfileSyncServiceHarness::AwaitBackendInitialized() {
- DVLOG(1) << GetClientInfoString("AwaitBackendInitialized");
- if (service()->sync_initialized()) {
- // The sync backend host has already been initialized; don't wait.
- return true;
- }
-
- CallbackStatusChecker backend_initialized_checker(
- base::Bind(&DoneWaitingForBackendInitialization,
- base::Unretained(this)),
- "DoneWaitingForBackendInitialization");
- AwaitStatusChange(&backend_initialized_checker, "AwaitBackendInitialized");
- return service()->sync_initialized();
-}
-
-bool ProfileSyncServiceHarness::AwaitDataSyncCompletion() {
- DVLOG(1) << GetClientInfoString("AwaitDataSyncCompletion");
-
- DCHECK(service()->sync_initialized());
- DCHECK(!IsSyncDisabled());
-
- if (IsDataSynced()) {
- // Client is already synced; don't wait.
- return true;
- }
-
- CallbackStatusChecker data_synced_checker(
- base::Bind(&ProfileSyncServiceHarness::IsDataSynced,
- base::Unretained(this)),
- "IsDataSynced");
- return AwaitStatusChange(&data_synced_checker, "AwaitDataSyncCompletion");
-}
-
-bool ProfileSyncServiceHarness::AwaitFullSyncCompletion() {
- DVLOG(1) << GetClientInfoString("AwaitFullSyncCompletion");
- if (IsSyncDisabled()) {
- LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
- return false;
- }
-
- if (IsFullySynced()) {
- // Client is already synced; don't wait.
- return true;
- }
-
- DCHECK(service()->sync_initialized());
- CallbackStatusChecker fully_synced_checker(
- base::Bind(&DoneWaitingForFullSync, base::Unretained(this)),
- "DoneWaitingForFullSync");
- AwaitStatusChange(&fully_synced_checker, "AwaitFullSyncCompletion");
- return IsFullySynced();
-}
-
-bool ProfileSyncServiceHarness::AwaitSyncDisabled() {
- DCHECK(service()->HasSyncSetupCompleted());
- DCHECK(!IsSyncDisabled());
- CallbackStatusChecker sync_disabled_checker(
- base::Bind(&ProfileSyncServiceHarness::IsSyncDisabled,
- base::Unretained(this)),
- "IsSyncDisabled");
- return AwaitStatusChange(&sync_disabled_checker, "AwaitSyncDisabled");
-}
-
bool ProfileSyncServiceHarness::AwaitMutualSyncCycleCompletion(
ProfileSyncServiceHarness* partner) {
- DVLOG(1) << GetClientInfoString("AwaitMutualSyncCycleCompletion");
- if (!AwaitFullSyncCompletion())
- return false;
- return partner->WaitUntilProgressMarkersMatch(this);
+ std::vector<ProfileSyncServiceHarness*> harnesses;
+ harnesses.push_back(this);
+ harnesses.push_back(partner);
+ return AwaitQuiescence(harnesses);
}
bool ProfileSyncServiceHarness::AwaitGroupSyncCycleCompletion(
std::vector<ProfileSyncServiceHarness*>& partners) {
- DVLOG(1) << GetClientInfoString("AwaitGroupSyncCycleCompletion");
- if (!AwaitFullSyncCompletion())
- return false;
- bool return_value = true;
- for (std::vector<ProfileSyncServiceHarness*>::iterator it =
- partners.begin(); it != partners.end(); ++it) {
- if ((this != *it) && (!(*it)->IsSyncDisabled())) {
- return_value = return_value &&
- (*it)->WaitUntilProgressMarkersMatch(this);
- }
- }
- return return_value;
+ return AwaitQuiescence(partners);
}
// static
bool ProfileSyncServiceHarness::AwaitQuiescence(
std::vector<ProfileSyncServiceHarness*>& clients) {
- DVLOG(1) << "AwaitQuiescence.";
- bool return_value = true;
- for (std::vector<ProfileSyncServiceHarness*>::iterator it =
- clients.begin(); it != clients.end(); ++it) {
- if (!(*it)->IsSyncDisabled()) {
- return_value = return_value &&
- (*it)->AwaitGroupSyncCycleCompletion(clients);
- }
- }
- return return_value;
-}
-
-bool ProfileSyncServiceHarness::WaitUntilProgressMarkersMatch(
- ProfileSyncServiceHarness* partner) {
- DVLOG(1) << GetClientInfoString("WaitUntilProgressMarkersMatch");
- if (IsSyncDisabled()) {
- LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
- return false;
- }
-
- // TODO(rsimha): Replace the mechanism of matching up progress markers with
- // one that doesn't require every client to have the same progress markers.
- DCHECK(!progress_marker_partner_);
- progress_marker_partner_ = partner;
- bool return_value = false;
- if (MatchesPartnerClient()) {
- // Progress markers already match; don't wait.
- return_value = true;
- } else {
- partner->service()->AddObserver(this);
- CallbackStatusChecker matches_other_client_checker(
- base::Bind(&ProfileSyncServiceHarness::MatchesPartnerClient,
- base::Unretained(this)),
- "MatchesPartnerClient");
- return_value = AwaitStatusChange(&matches_other_client_checker,
- "WaitUntilProgressMarkersMatch");
- partner->service()->RemoveObserver(this);
- }
- progress_marker_partner_ = NULL;
- return return_value;
-}
-
-bool ProfileSyncServiceHarness::AwaitStatusChange(
- StatusChangeChecker* checker, const std::string& source) {
- DVLOG(1) << GetClientInfoString("AwaitStatusChange");
-
- if (IsSyncDisabled()) {
- LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
- return false;
- }
-
- DCHECK(status_change_checker_ == NULL);
- status_change_checker_ = checker;
-
- base::OneShotTimer<ProfileSyncServiceHarness> timer;
- timer.Start(FROM_HERE,
- base::TimeDelta::FromMilliseconds(kSyncOperationTimeoutMs),
- base::Bind(&ProfileSyncServiceHarness::QuitMessageLoop,
- base::Unretained(this)));
- {
- base::MessageLoop* loop = base::MessageLoop::current();
- base::MessageLoop::ScopedNestableTaskAllower allow(loop);
- loop->Run();
+ std::vector<ProfileSyncService*> services;
+ if (clients.empty()) {
+ return true;
}
- status_change_checker_ = NULL;
-
- if (timer.IsRunning()) {
- DVLOG(1) << GetClientInfoString("AwaitStatusChange succeeded");
- return true;
- } else {
- DVLOG(0) << GetClientInfoString(base::StringPrintf(
- "AwaitStatusChange called from %s timed out", source.c_str()));
- return false;
+ for (std::vector<ProfileSyncServiceHarness*>::iterator it = clients.begin();
+ it != clients.end(); ++it) {
+ services.push_back((*it)->service());
}
+ QuiesceStatusChangeChecker checker(services);
+ checker.Wait();
+ return !checker.TimedOut();
}
std::string ProfileSyncServiceHarness::GenerateFakeOAuth2RefreshTokenString() {
++oauth2_refesh_token_number_);
}
-ProfileSyncService::Status ProfileSyncServiceHarness::GetStatus() const {
- DCHECK(service() != NULL) << "GetStatus(): service() is NULL.";
- ProfileSyncService::Status result;
- service()->QueryDetailedSyncStatus(&result);
- return result;
-}
-
bool ProfileSyncServiceHarness::IsSyncDisabled() const {
return !service()->setup_in_progress() &&
!service()->HasSyncSetupCompleted();
}
-bool ProfileSyncServiceHarness::HasAuthError() const {
- return service()->GetAuthError().state() ==
- GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
- service()->GetAuthError().state() ==
- GoogleServiceAuthError::SERVICE_ERROR ||
- service()->GetAuthError().state() ==
- GoogleServiceAuthError::REQUEST_CANCELED;
-}
-
-// We use this function to share code between IsFullySynced and IsDataSynced.
-bool ProfileSyncServiceHarness::IsDataSyncedImpl() const {
- return ServiceIsPushingChanges() &&
- GetStatus().notifications_enabled &&
- !service()->HasUnsyncedItems() &&
- !HasPendingBackendMigration();
-}
-
-bool ProfileSyncServiceHarness::IsDataSynced() const {
- if (service() == NULL) {
- DVLOG(1) << GetClientInfoString("IsDataSynced(): false");
- return false;
- }
-
- bool is_data_synced = IsDataSyncedImpl();
-
- DVLOG(1) << GetClientInfoString(
- is_data_synced ? "IsDataSynced: true" : "IsDataSynced: false");
- return is_data_synced;
-}
-
-bool ProfileSyncServiceHarness::IsFullySynced() const {
- if (service() == NULL) {
- DVLOG(1) << GetClientInfoString("IsFullySynced: false");
- return false;
- }
- // If we didn't try to commit anything in the previous cycle, there's a
- // good chance that we're now fully up to date.
- const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
- bool is_fully_synced =
- snap.model_neutral_state().num_successful_commits == 0
- && snap.model_neutral_state().commit_result == syncer::SYNCER_OK
- && IsDataSyncedImpl();
-
- DVLOG(1) << GetClientInfoString(
- is_fully_synced ? "IsFullySynced: true" : "IsFullySynced: false");
- return is_fully_synced;
-}
-
void ProfileSyncServiceHarness::FinishSyncSetup() {
service()->SetSetupInProgress(false);
service()->SetSyncSetupCompleted();
}
-bool ProfileSyncServiceHarness::HasPendingBackendMigration() const {
- browser_sync::BackendMigrator* migrator =
- service()->GetBackendMigratorForTest();
- return migrator && migrator->state() != browser_sync::BackendMigrator::IDLE;
-}
-
-bool ProfileSyncServiceHarness::AutoStartEnabled() {
- return service()->auto_start_enabled();
-}
-
-bool ProfileSyncServiceHarness::MatchesPartnerClient() const {
- // TODO(akalin): Shouldn't this belong with the intersection check?
- // Otherwise, this function isn't symmetric.
- DCHECK(progress_marker_partner_);
- if (!IsFullySynced()) {
- DVLOG(2) << profile_debug_name_ << ": not synced, assuming doesn't match";
- return false;
- }
-
- // Only look for a match if we have at least one enabled datatype in
- // common with the partner client.
- const syncer::ModelTypeSet common_types =
- Intersection(service()->GetActiveDataTypes(),
- progress_marker_partner_->service()->GetActiveDataTypes());
-
- DVLOG(2) << profile_debug_name_ << ", "
- << progress_marker_partner_->profile_debug_name_
- << ": common types are "
- << syncer::ModelTypeSetToString(common_types);
-
- if (!common_types.Empty() && !progress_marker_partner_->IsFullySynced()) {
- DVLOG(2) << "non-empty common types and "
- << progress_marker_partner_->profile_debug_name_
- << " isn't synced";
- return false;
- }
-
- for (syncer::ModelTypeSet::Iterator i = common_types.First();
- i.Good(); i.Inc()) {
- const std::string marker = GetSerializedProgressMarker(i.Get());
- const std::string partner_marker =
- progress_marker_partner_->GetSerializedProgressMarker(i.Get());
- if (marker != partner_marker) {
- if (VLOG_IS_ON(2)) {
- std::string marker_base64, partner_marker_base64;
- base::Base64Encode(marker, &marker_base64);
- base::Base64Encode(partner_marker, &partner_marker_base64);
- DVLOG(2) << syncer::ModelTypeToString(i.Get()) << ": "
- << profile_debug_name_ << " progress marker = "
- << marker_base64 << ", "
- << progress_marker_partner_->profile_debug_name_
- << " partner progress marker = "
- << partner_marker_base64;
- }
- return false;
- }
- }
- return true;
-}
-
SyncSessionSnapshot ProfileSyncServiceHarness::GetLastSessionSnapshot() const {
DCHECK(service() != NULL) << "Sync service has not yet been set up.";
if (service()->sync_initialized()) {
synced_datatypes.Put(syncer::ModelTypeFromInt(datatype));
service()->OnUserChoseDatatypes(false, synced_datatypes);
- if (AwaitDataSyncCompletion()) {
+ if (AwaitSyncSetupCompletion(service())) {
DVLOG(1) << "EnableSyncForDatatype(): Enabled sync for datatype "
<< syncer::ModelTypeToString(datatype)
<< " on " << profile_debug_name_ << ".";
synced_datatypes.RetainAll(syncer::UserSelectableTypes());
synced_datatypes.Remove(datatype);
service()->OnUserChoseDatatypes(false, synced_datatypes);
- if (AwaitFullSyncCompletion()) {
+ if (AwaitSyncSetupCompletion(service())) {
DVLOG(1) << "DisableSyncForDatatype(): Disabled sync for datatype "
<< syncer::ModelTypeToString(datatype)
<< " on " << profile_debug_name_ << ".";
}
service()->OnUserChoseDatatypes(true, syncer::ModelTypeSet::All());
- if (AwaitFullSyncCompletion()) {
+ if (AwaitSyncSetupCompletion(service())) {
DVLOG(1) << "EnableSyncForAllDatatypes(): Enabled sync for all datatypes "
<< "on " << profile_debug_name_ << ".";
return true;
return true;
}
-std::string ProfileSyncServiceHarness::GetSerializedProgressMarker(
- syncer::ModelType model_type) const {
- const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
- const syncer::ProgressMarkerMap& markers_map =
- snap.download_progress_markers();
-
- syncer::ProgressMarkerMap::const_iterator it =
- markers_map.find(model_type);
- return (it != markers_map.end()) ? it->second : std::string();
-}
-
+// TODO(sync): Clean up this method in a separate CL. Remove all snapshot fields
+// and log shorter, more meaningful messages.
std::string ProfileSyncServiceHarness::GetClientInfoString(
const std::string& message) const {
std::stringstream os;
os << profile_debug_name_ << ": " << message << ": ";
if (service()) {
const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
- const ProfileSyncService::Status& status = GetStatus();
+ ProfileSyncService::Status status;
+ service()->QueryDetailedSyncStatus(&status);
// Capture select info from the sync session snapshot and syncer status.
- // TODO(rsimha): Audit the list of fields below, and eventually eliminate
- // the use of the sync session snapshot. See crbug.com/323380.
os << ", has_unsynced_items: "
<< (service()->sync_initialized() ? service()->HasUnsyncedItems() : 0)
<< ", did_commit: "
<< ", notifications_enabled: "
<< status.notifications_enabled
<< ", service_is_pushing_changes: "
- << ServiceIsPushingChanges()
- << ", has_pending_backend_migration: "
- << HasPendingBackendMigration();
+ << service()->ShouldPushChanges();
} else {
os << "Sync service not available";
}
return os.str();
}
-bool ProfileSyncServiceHarness::EnableEncryption() {
- if (IsEncryptionComplete())
- return true;
- service()->EnableEncryptEverything();
-
- // In order to kick off the encryption we have to reconfigure. Just grab the
- // currently synced types and use them.
- const syncer::ModelTypeSet synced_datatypes =
- service()->GetPreferredDataTypes();
- bool sync_everything =
- synced_datatypes.Equals(syncer::ModelTypeSet::All());
- service()->OnUserChoseDatatypes(sync_everything, synced_datatypes);
-
- // Wait some time to let the enryption finish.
- return WaitForEncryption();
-}
-
-bool ProfileSyncServiceHarness::WaitForEncryption() {
- if (IsEncryptionComplete()) {
- // Encryption is already complete; do not wait.
- return true;
- }
-
- CallbackStatusChecker encryption_complete_checker(
- base::Bind(&ProfileSyncServiceHarness::IsEncryptionComplete,
- base::Unretained(this)),
- "IsEncryptionComplete");
- return AwaitStatusChange(&encryption_complete_checker, "WaitForEncryption");
-}
-
-bool ProfileSyncServiceHarness::IsEncryptionComplete() const {
- bool is_encryption_complete = service()->EncryptEverythingEnabled() &&
- !service()->encryption_pending();
- DVLOG(2) << "Encryption is "
- << (is_encryption_complete ? "" : "not ")
- << "complete; Encrypted types = "
- << syncer::ModelTypeSetToString(service()->GetEncryptedDataTypes());
- return is_encryption_complete;
-}
-
-bool ProfileSyncServiceHarness::IsTypeRunning(syncer::ModelType type) {
- browser_sync::DataTypeController::StateMap state_map;
- service()->GetDataTypeControllerStates(&state_map);
- return (state_map.count(type) != 0 &&
- state_map[type] == browser_sync::DataTypeController::RUNNING);
-}
-
bool ProfileSyncServiceHarness::IsTypePreferred(syncer::ModelType type) {
return service()->GetPreferredDataTypes().Has(type);
}
-size_t ProfileSyncServiceHarness::GetNumEntries() const {
- return GetLastSessionSnapshot().num_entries();
-}
-
-size_t ProfileSyncServiceHarness::GetNumDatatypes() const {
- browser_sync::DataTypeController::StateMap state_map;
- service()->GetDataTypeControllerStates(&state_map);
- return state_map.size();
-}
-
std::string ProfileSyncServiceHarness::GetServiceStatus() {
scoped_ptr<base::DictionaryValue> value(
sync_ui_util::ConstructAboutInformation(service()));
projects / platform / framework / web / crosswalk.git / blobdiff