Commit 634bc017 authored by scottmg@chromium.org's avatar scottmg@chromium.org

Revert 239771 "SyncFS v2: Add re-initialization code for tempora..."

Lightly suspected of causing failures on CrOS:

http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%282%29/builds/9981

> SyncFS v2: Add re-initialization code for temporary service failure case
> 
> Also run SyncEngineInitializer task at high priority.
> 
> BUG=240165
> TEST=manual
> 
> Review URL: https://codereview.chromium.org/110113003

TBR=kinuko@chromium.org

Review URL: https://codereview.chromium.org/111893007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239923 0039d316-1c4b-4281-b951-d872f2087c98
parent 1d4b7c7c
......@@ -148,9 +148,6 @@ void SyncEngine::AddFileStatusObserver(FileStatusObserver* observer) {
void SyncEngine::RegisterOrigin(
const GURL& origin,
const SyncStatusCallback& callback) {
if (!metadata_database_ && drive_service_->HasRefreshToken())
PostInitializeTask();
task_manager_->ScheduleSyncTaskAtPriority(
scoped_ptr<SyncTask>(new RegisterAppTask(this, origin.host())),
SyncTaskManager::PRIORITY_HIGH,
......@@ -333,9 +330,6 @@ void SyncEngine::NotifyLastOperationStatus(
}
void SyncEngine::OnNotificationReceived() {
if (service_state_ == REMOTE_SERVICE_TEMPORARY_UNAVAILABLE)
UpdateServiceState(REMOTE_SERVICE_OK, "Got push notification for Drive.");
should_check_remote_change_ = true;
MaybeScheduleNextTask();
}
......@@ -443,9 +437,8 @@ void SyncEngine::PostInitializeTask() {
task_runner_.get(),
drive_service_.get(),
base_dir_.Append(kDatabaseName));
task_manager_->ScheduleSyncTaskAtPriority(
task_manager_->ScheduleSyncTask(
scoped_ptr<SyncTask>(initializer),
SyncTaskManager::PRIORITY_HIGH,
base::Bind(&SyncEngine::DidInitialize, weak_ptr_factory_.GetWeakPtr(),
initializer));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment