Removed kOTRStashStatePathSystemBackupExcluded

Removed the previous related upgrade path that was setting the
"do not backup" bit to YES for OTR state stash path.

Also, changed the AddSkipSystemBackupAttributeToItem to take a
boolean which gives us better flexibility in order to control the
"do not backup" bit.

Review URL: https://codereview.chromium.org/1511443002

Cr-Commit-Position: refs/heads/master@{#365671}

ios/chrome/browser/file_metadata_util.h

@@ -7,13 +7,11 @@
 
 #include "base/files/file_path.h"
 
-namespace file_metadata_util {
+// Synchronously sets a bit on the file system that informs the system whether
+// iCloud/iTunes backups of the file/folder at |path| should be excluded or not.
+// There must be a file/folder present at |path|.
+void SetSkipSystemBackupAttributeToItem(const base::FilePath& path,
+                                        bool skip_system_backup);
 
-// Synchronously sets a bit on the file system that prevents iCloud/iTunes
-// backups of the file/folder at |path|. There must be a file/folder present at
-// |path|.
-void AddSkipSystemBackupAttributeToItem(const base::FilePath& path);
-
-}  // namespace file_metadata_util
 
 #endif  // IOS_CHROME_BROWSER_FILE_METADATA_UTIL_H_

ios/chrome/browser/file_metadata_util.mm

@@ -10,22 +10,20 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 
-namespace file_metadata_util {
-
-void AddSkipSystemBackupAttributeToItem(const base::FilePath& path) {
+void SetSkipSystemBackupAttributeToItem(const base::FilePath& path,
+                                        bool skip_system_backup) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   NSURL* file_url =
       [NSURL fileURLWithPath:base::SysUTF8ToNSString(path.value())];
   DCHECK([[NSFileManager defaultManager] fileExistsAtPath:file_url.path]);
 
   NSError* error = nil;
-  BOOL success = [file_url setResourceValue:@YES
+  BOOL success = [file_url setResourceValue:(skip_system_backup ? @YES : @NO)
                                      forKey:NSURLIsExcludedFromBackupKey
                                       error:&error];
   if (!success) {
     LOG(ERROR) << [[error description] UTF8String];
   }
 }
 
-}  // namespace file_metadata_util

ios/chrome/browser/pref_names.cc

@@ -89,12 +89,6 @@ const char kMetricsReportingWifiOnly[] =
 // Which page should be visible on the new tab page v4
 const char kNtpShownPage[] = "ntp.shown_page";
 
-// Boolean which indicates if the user has already set a "do not backup" bit to
-// the OTR Profiles's state stash path to ensure that the folder is not
-// automatically synced to iCloud/iTunes.
-const char kOTRStashStatePathSystemBackupExcluded[] =
-    "ios.otr_stash_state_path_system_backup_excluded";
-
 // Boolean controlling whether history saving is disabled.
 const char kSavingBrowserHistoryDisabled[] = "history.saving_disabled";
 

ios/chrome/browser/pref_names.h

@@ -27,7 +27,6 @@ extern const char kLastSessionExitedCleanly[];
 extern const char kLastSessionUsedWKWebViewControlGroup[];
 extern const char kMetricsReportingWifiOnly[];
 extern const char kNtpShownPage[];
-extern const char kOTRStashStatePathSystemBackupExcluded[];
 extern const char kSavingBrowserHistoryDisabled[];
 extern const char kSearchSuggestEnabled[];
 

ios/chrome/browser/prefs/browser_prefs.mm

@@ -71,10 +71,6 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 
   data_reduction_proxy::RegisterPrefs(registry);
 
-  // TODO(shreyasv): Remove this in M49 as almost all users would have the
-  // "do not backup" bit set by then. crbug.com/489865.
-  registry->RegisterBooleanPref(prefs::kOTRStashStatePathSystemBackupExcluded,
-                                false);
   registry->RegisterBooleanPref(prefs::kBrowsingDataMigrationHasBeenPossible,
                                 false);