Get rid of ClearByPathBackupExclusion.

We planned on keeping ClearByPathBackupExclusion around as temporary code to
clean up the mess we used to make in
/Library/Preferences/com.apple.TimeMachine.plist. Evidently, when we ask
CSBackupSetItemExcluded to include-by-path an item that was previously
excluded by path, it will remove the ExcludeByPath entry for the path from
that plist, but it will also add an IncludeByPath entry. There is no way
using this API to clean up the mess we made in the past, we can only trade
an "exclude" mess for an "include" mess. It's not worth attempting to modify
the file ourselves, avoiding the CSBackupSetItemExcluded API, and it's
probably not even possible because the plist will likely be rewritten by
a system process anyway.

BUG=86845, 85999
TEST=No changes made to the plist mentioned above.
Review URL: http://codereview.chromium.org/7206030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89741 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 27 deletions

diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h
index 0d101c9..7fe22c5 100644
--- a/base/mac/mac_util.h
+++ b/base/mac/mac_util.h
@@ -81,12 +81,6 @@ void ActivateProcess(pid_t pid);
 // Excludes the file given by |file_path| from being backed up by Time Machine.
 bool SetFileBackupExclusion(const FilePath& file_path);
 
-// TODO(mrossetti): Remove in M15. See http://crbug.com/85999
-// Remove possible exclude-by-path setting from |file_path|. Ignore errors since
-// we don't care if the file does not exist or if it has not had its exclusion
-// set by-path. This function is a NOOP for Mac OS X Lion or later.
-void ClearByPathBackupExclusion(const FilePath& file_path);
-
 // Sets the process name as displayed in Activity Monitor to process_name.
 void SetProcessName(CFStringRef process_name);
 
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
index 100f23a..d3bb5a6 100644
--- a/base/mac/mac_util.mm
+++ b/base/mac/mac_util.mm
@@ -242,28 +242,7 @@ void ActivateProcess(pid_t pid) {
   }
 }
 
-// TODO(mrossetti): Remove in M15. See http://crbug.com/85999
-void ClearByPathBackupExclusion(const FilePath& file_path) {
-  if (IsOSSnowLeopardOrEarlier()) {
-    NSString* file_path_ns =
-        [NSString stringWithUTF8String:file_path.value().c_str()];
-    NSURL* file_url = [NSURL fileURLWithPath:file_path_ns];
-    // Ignore errors since the file may not exist.
-    CSBackupSetItemExcluded(base::mac::NSToCFCast(file_url), FALSE, TRUE);
-  }
-}
-
 bool SetFileBackupExclusion(const FilePath& file_path) {
-  // Do a pre-emptive unexclude by-path since by-path exclusions may have
-  // been performed on this file in the past. This feature is available to
-  // administrative users in 10.5 and 10.6, but is restricted to the root
-  // user in 10.7. Since it logs messages to the console in 10.7 and
-  // wouldn't work anyway, avoid calling it altogether in that version.
-  //
-  // TODO(mrossetti): Remove on the trunk after September
-  // 2011, M15. http://crbug.com/85999
-  ClearByPathBackupExclusion(file_path);
-
   NSString* file_path_ns =
       [NSString stringWithUTF8String:file_path.value().c_str()];
   NSURL* file_url = [NSURL fileURLWithPath:file_path_ns];