[ios] Fix kRemoveProtectionFromPrefFile check

Move kRemoveProtectionFromPrefFile check to a later stage when Finch is
actually initialized. Before this change kRemoveProtectionFromPrefFile
chekh would always return false.

Bug: None
Change-Id: I4cb5eeb5b96760572ffa34146b15b9361fb7cd60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2568217
Auto-Submit: Eugene But <eugenebut@chromium.org>
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833836}

ios/chrome/browser/application_context_impl.mm

@@ -83,25 +83,6 @@
 
 namespace {
 
-// If enabled local state file will have NSURLFileProtectionNone protection
-// level set for NSURLFileProtectionKey key. The purpose of this feature is to
-// understand if file protection interferes with "clean exit beacon" pref.
-const base::Feature kRemoveProtectionFromPrefFile{
-    "RemoveProtectionFromPrefFile", base::FEATURE_DISABLED_BY_DEFAULT};
-
-// Sets |level| value for NSURLFileProtectionKey key for the URL with given
-// |local_state_path|.
-void SetProtectionLevel(const base::FilePath& file_path, id level) {
-  NSString* file_path_string = base::SysUTF8ToNSString(file_path.value());
-  NSURL* file_path_url = [NSURL fileURLWithPath:file_path_string
-                                    isDirectory:NO];
-  NSError* error = nil;
-  BOOL protection_set = [file_path_url setResourceValue:level
-                                                 forKey:NSURLFileProtectionKey
-                                                  error:&error];
-  DCHECK(protection_set) << base::SysNSStringToUTF8(error.localizedDescription);
-}
-
 // Requests a network::mojom::ProxyResolvingSocketFactory on the UI thread.
 // Note that this cannot be called on a thread that is not the UI thread.
 void RequestProxyResolvingSocketFactoryOnUIThread(
@@ -502,23 +483,6 @@ void ApplicationContextImpl::CreateLocalState() {
   base::FilePath local_state_path;
   CHECK(base::PathService::Get(ios::FILE_LOCAL_STATE, &local_state_path));
 
-  NSString* const kRemoveProtectionFromPrefFileKey =
-      @"RemoveProtectionFromPrefKey";
-  if (base::FeatureList::IsEnabled(kRemoveProtectionFromPrefFile)) {
-    SetProtectionLevel(local_state_path, NSURLFileProtectionNone);
-    [NSUserDefaults.standardUserDefaults
-        setBool:YES
-         forKey:kRemoveProtectionFromPrefFileKey];
-  } else if ([NSUserDefaults.standardUserDefaults
-                 boolForKey:kRemoveProtectionFromPrefFileKey]) {
-    // Restore default protection level when user is no longer in the
-    // experimental group.
-    SetProtectionLevel(local_state_path,
-                       NSFileProtectionCompleteUntilFirstUserAuthentication);
-    [NSUserDefaults.standardUserDefaults
-        removeObjectForKey:kRemoveProtectionFromPrefFileKey];
-  }
-
   scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple);
 
   // Register local state preferences.

ios/chrome/browser/ios_chrome_main_parts.mm

@@ -13,6 +13,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
+#include "base/strings/sys_string_conversions.h"
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "base/time/default_tick_clock.h"
@@ -78,6 +79,25 @@
 
 namespace {
 
+// If enabled local state file will have NSURLFileProtectionNone protection
+// level set for NSURLFileProtectionKey key. The purpose of this feature is to
+// understand if file protection interferes with "clean exit beacon" pref.
+const base::Feature kRemoveProtectionFromPrefFile{
+    "RemoveProtectionFromPrefFile", base::FEATURE_DISABLED_BY_DEFAULT};
+
+// Sets |level| value for NSURLFileProtectionKey key for the URL with given
+// |local_state_path|.
+void SetProtectionLevel(const base::FilePath& file_path, id level) {
+  NSString* file_path_string = base::SysUTF8ToNSString(file_path.value());
+  NSURL* file_path_url = [NSURL fileURLWithPath:file_path_string
+                                    isDirectory:NO];
+  NSError* error = nil;
+  BOOL protection_set = [file_path_url setResourceValue:level
+                                                 forKey:NSURLFileProtectionKey
+                                                  error:&error];
+  DCHECK(protection_set) << base::SysNSStringToUTF8(error.localizedDescription);
+}
+
 #if BUILDFLAG(USE_ALLOCATOR_SHIM)
 // Do not install allocator shim on iOS 13.4 due to high crash volume on this
 // particular version of OS. TODO(crbug.com/1108219): Remove this workaround
@@ -193,6 +213,23 @@ void IOSChromeMainParts::PreCreateThreads() {
   metrics::EnableExpiryChecker(::kExpiredHistogramsHashes,
                                ::kNumExpiredHistograms);
 
+  NSString* const kRemoveProtectionFromPrefFileKey =
+      @"RemoveProtectionFromPrefKey";
+  if (base::FeatureList::IsEnabled(kRemoveProtectionFromPrefFile)) {
+    SetProtectionLevel(local_state_path, NSURLFileProtectionNone);
+    [NSUserDefaults.standardUserDefaults
+        setBool:YES
+         forKey:kRemoveProtectionFromPrefFileKey];
+  } else if ([NSUserDefaults.standardUserDefaults
+                 boolForKey:kRemoveProtectionFromPrefFileKey]) {
+    // Restore default protection level when user is no longer in the
+    // experimental group.
+    SetProtectionLevel(local_state_path,
+                       NSFileProtectionCompleteUntilFirstUserAuthentication);
+    [NSUserDefaults.standardUserDefaults
+        removeObjectForKey:kRemoveProtectionFromPrefFileKey];
+  }
+
   application_context_->PreCreateThreads();
 }