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

trunk/src/chrome/browser/sync_file_system/drive_backend/sync_engine.cc

 // Copyright 2013 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/sync_file_system/drive_backend/sync_engine.h"
 
 #include "base/bind.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/drive/drive_api_service.h"
@@ skipping 130 matching lines @@
   service_observers_.AddObserver(observer);
 }
 
 void SyncEngine::AddFileStatusObserver(FileStatusObserver* observer) {
   file_status_observers_.AddObserver(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,
       callback);
 }
 
 void SyncEngine::EnableOrigin(
     const GURL& origin,
     const SyncStatusCallback& callback) {
   task_manager_->ScheduleTaskAtPriority(
@@ skipping 162 matching lines @@
   if (metadata_database_) {
     FOR_EACH_OBSERVER(
         Observer,
         service_observers_,
         OnRemoteChangeQueueUpdated(
             metadata_database_->GetDirtyTrackerCount()));
   }
 }
 
 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();
 }
 
 void SyncEngine::OnPushNotificationEnabled(bool enabled) {}
 
 void SyncEngine::OnReadyToSendRequests() {
   if (service_state_ == REMOTE_SERVICE_OK)
     return;
   UpdateServiceState(REMOTE_SERVICE_OK, "Authenticated");
@@ skipping 87 matching lines @@
 void SyncEngine::PostInitializeTask() {
   DCHECK(!metadata_database_);
 
   // This initializer task may not run if metadata_database_ is already
   // initialized when it runs.
   SyncEngineInitializer* initializer =
       new SyncEngineInitializer(this,
                                 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));
 }
 
 void SyncEngine::DidInitialize(SyncEngineInitializer* initializer,
                                SyncStatusCode status) {
   if (status != SYNC_STATUS_OK) {
     if (drive_service_->HasRefreshToken()) {
       UpdateServiceState(REMOTE_SERVICE_TEMPORARY_UNAVAILABLE,
                          "Could not initialize remote service");
@@ skipping 211 matching lines @@
         tracker.tracker_kind() == TRACKER_KIND_APP_ROOT;
     if (is_app_enabled && !is_app_root_tracker_enabled)
       EnableOrigin(origin, base::Bind(&EmptyStatusCallback));
     else if (!is_app_enabled && is_app_root_tracker_enabled)
       DisableOrigin(origin, base::Bind(&EmptyStatusCallback));
   }
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system