[SyncFS] Fix unknown origin handling in SyncEngine

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 497 matching lines @@
                                                 syncer->target_path());
     }
     FOR_EACH_OBSERVER(FileStatusObserver,
                       file_status_observers_,
                       OnFileStatusChanged(updated_url,
                                           SYNC_FILE_STATUS_SYNCED,
                                           syncer->sync_action(),
                                           SYNC_DIRECTION_LOCAL_TO_REMOTE));
   }
 
+  if (status == SYNC_STATUS_UNKNOWN_ORIGIN && syncer->url().is_valid()) {
+    RegisterOrigin(syncer->url().origin(),
+                   base::Bind(&EmptyStatusCallback));
+  }
+
   if (status != SYNC_STATUS_OK &&
       status != SYNC_STATUS_NO_CHANGE_TO_SYNC) {
     callback.Run(status);
     return;
   }
 
   if (status == SYNC_STATUS_NO_CHANGE_TO_SYNC)
     metadata_database_->PromoteLowerPriorityTrackersToNormal();
 
   if (status == SYNC_STATUS_OK)
     should_check_conflict_ = true;
 
-  if (status == SYNC_STATUS_UNKNOWN_ORIGIN && syncer->url().is_valid()) {
-    RegisterOrigin(syncer->url().origin(),
-                   base::Bind(&EmptyStatusCallback));
-  }
-
   callback.Run(status);
 }
 
 void SyncEngine::MaybeStartFetchChanges() {
   if (GetCurrentState() == REMOTE_SERVICE_DISABLED)
     return;
 
   if (!metadata_database_)
     return;
 
@@ skipping 125 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