[iOS] Don't show encryption error when sync is disabled

Don't show encryption error when sync is disabled.

Bug: 914059
Change-Id: I719bf76ea87d670c8deda34532ed185a4d4d4685
Reviewed-on: https://chromium-review.googlesource.com/c/1487814Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635472}

ios/chrome/browser/ui/settings/google_services/google_services_settings_mediator.mm

@@ -311,7 +311,7 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
   BOOL hasError = NO;
   ItemType type;
 
-  if (self.isAuthenticated) {
+  if (self.isAuthenticated && self.syncSetupService->IsSyncEnabled()) {
     switch (self.syncSetupService->GetSyncServiceState()) {
       case SyncSetupService::kSyncServiceUnrecoverableError:
         type = RestartAuthenticationFlowErrorItemType;

ios/chrome/browser/ui/settings/google_services/manage_sync_settings_mediator.mm

@@ -223,7 +223,8 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
   BOOL needsUpdate =
       self.shouldEncryptionItemBeEnabled &&
       (self.encryptionItem.enabled != self.shouldEncryptionItemBeEnabled);
-  if (self.syncSetupService->GetSyncServiceState() ==
+  if (self.shouldEncryptionItemBeEnabled &&
+      self.syncSetupService->GetSyncServiceState() ==
           SyncSetupService::kSyncServiceNeedsPassphrase) {
     needsUpdate = needsUpdate || self.encryptionItem.image == nil;
     self.encryptionItem.image =