Allow sync to resume in local backend mode after it has been disabled.

components/browser_sync/profile_sync_service.cc

 // Copyright (c) 2012 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 "components/browser_sync/profile_sync_service.h"
 
 #include <stddef.h>
 
 #include <cstddef>
 #include <map>
@@ skipping 2205 matching lines @@
 }
 
 void ProfileSyncService::RequestStop(SyncStopDataFate data_fate) {
   DCHECK(thread_checker_.CalledOnValidThread());
   sync_prefs_.SetSyncRequested(false);
   StopImpl(data_fate);
 }
 
 bool ProfileSyncService::IsSyncRequested() const {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return sync_prefs_.IsSyncRequested();
+  // When local sync is on sync should be considered requsted or otherwise it
+  // will not resume after the policy or the flag has been removed.
+  return sync_prefs_.IsSyncRequested() || sync_prefs_.IsLocalSyncEnabled();
 }
 
 SigninManagerBase* ProfileSyncService::signin() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!signin_)
     return nullptr;
   return signin_->GetOriginal();
 }
 
 void ProfileSyncService::RequestStart() {
@@ skipping 213 matching lines @@
     return;
 
   DCHECK(startup_controller_->IsSetupInProgress());
   startup_controller_->SetSetupInProgress(false);
 
   if (IsEngineInitialized())
     ReconfigureDatatypeManager();
   NotifyObservers();
 }
 }  // namespace browser_sync