URLByAppendingPathComponent: to URLByAppendingPathComponent:isDirectory:

URLByAppendingPathComponent: hits disk just to tell if it needs to append a slash at the end.

Uses URLByAppendingPathComponent:isDirectory: instead.

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

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

3 files changed, 19 insertions, 11 deletions

diff --git a/ios/chrome/common/app_group/app_group_constants.mm b/ios/chrome/common/app_group/app_group_constants.mm
index ba9cee7..73edbfb 100644
--- a/ios/chrome/common/app_group/app_group_constants.mm
+++ b/ios/chrome/common/app_group/app_group_constants.mm
@@ -80,7 +80,8 @@ NSURL* ShareExtensionItemsFolder() {
   NSURL* groupURL = [[NSFileManager defaultManager]
       containerURLForSecurityApplicationGroupIdentifier:ApplicationGroup()];
   NSURL* readingListURL =
-      [groupURL URLByAppendingPathComponent:@"ShareExtensionItems"];
+      [groupURL URLByAppendingPathComponent:@"ShareExtensionItems"
+                                isDirectory:YES];
   return readingListURL;
 }
 
diff --git a/ios/chrome/common/app_group/app_group_metrics_client.mm b/ios/chrome/common/app_group/app_group_metrics_client.mm
index 48fd079..b458222 100644
--- a/ios/chrome/common/app_group/app_group_metrics_client.mm
+++ b/ios/chrome/common/app_group/app_group_metrics_client.mm
@@ -25,8 +25,9 @@ void AddPendingLog(NSData* log, AppGroupApplications application) {
   NSURL* store_url = [file_manager
       containerURLForSecurityApplicationGroupIdentifier:ApplicationGroup()];
 
-  NSURL* log_dir_url = [store_url
-      URLByAppendingPathComponent:app_group::kPendingLogFileDirectory];
+  NSURL* log_dir_url =
+      [store_url URLByAppendingPathComponent:app_group::kPendingLogFileDirectory
+                                 isDirectory:YES];
   [file_manager createDirectoryAtURL:log_dir_url
          withIntermediateDirectories:YES
                           attributes:nil
@@ -39,7 +40,8 @@ void AddPendingLog(NSData* log, AppGroupApplications application) {
                        static_cast<long>([[NSDate date] timeIntervalSince1970]),
                        ApplicationName(application),
                        app_group::kPendingLogFileSuffix];
-  NSURL* ready_log_url = [log_dir_url URLByAppendingPathComponent:file_name];
+  NSURL* ready_log_url =
+      [log_dir_url URLByAppendingPathComponent:file_name isDirectory:NO];
 
   [file_manager createFileAtPath:[ready_log_url path]
                         contents:log
@@ -50,8 +52,9 @@ void CleanOldPendingLogs() {
   NSFileManager* file_manager = [NSFileManager defaultManager];
   NSURL* store_url = [file_manager
       containerURLForSecurityApplicationGroupIdentifier:ApplicationGroup()];
-  NSURL* log_dir_url = [store_url
-      URLByAppendingPathComponent:app_group::kPendingLogFileDirectory];
+  NSURL* log_dir_url =
+      [store_url URLByAppendingPathComponent:app_group::kPendingLogFileDirectory
+                                 isDirectory:YES];
 
   NSArray* pending_logs =
       [file_manager contentsOfDirectoryAtPath:[log_dir_url path] error:nil];
@@ -64,7 +67,8 @@ void CleanOldPendingLogs() {
   for (NSString* file : pending_logs) {
     if (![file hasSuffix:app_group::kPendingLogFileSuffix])
       continue;
-    NSURL* file_url = [log_dir_url URLByAppendingPathComponent:file];
+    NSURL* file_url =
+        [log_dir_url URLByAppendingPathComponent:file isDirectory:NO];
 
     NSDictionary* properties =
         [file_manager attributesOfItemAtPath:[file_url path] error:nil];
@@ -89,7 +93,8 @@ void CleanOldPendingLogs() {
        file_index++) {
     NSString* path =
         [[sorted_files objectAtIndex:file_index] objectForKey:@"path"];
-    NSURL* file_url = [log_dir_url URLByAppendingPathComponent:path];
+    NSURL* file_url =
+        [log_dir_url URLByAppendingPathComponent:path isDirectory:NO];
     [file_manager removeItemAtURL:file_url error:nil];
   }
 }
diff --git a/ios/chrome/common/app_group/app_group_metrics_mainapp.mm b/ios/chrome/common/app_group/app_group_metrics_mainapp.mm
index 82818f28..3e32438 100644
--- a/ios/chrome/common/app_group/app_group_metrics_mainapp.mm
+++ b/ios/chrome/common/app_group/app_group_metrics_mainapp.mm
@@ -20,8 +20,9 @@ void ProcessPendingLogs(
   NSFileManager* file_manager = [NSFileManager defaultManager];
   NSURL* store_url = [file_manager
       containerURLForSecurityApplicationGroupIdentifier:ApplicationGroup()];
-  NSURL* log_dir_url = [store_url
-      URLByAppendingPathComponent:app_group::kPendingLogFileDirectory];
+  NSURL* log_dir_url =
+      [store_url URLByAppendingPathComponent:app_group::kPendingLogFileDirectory
+                                 isDirectory:YES];
 
   NSArray* pending_logs =
       [file_manager contentsOfDirectoryAtPath:[log_dir_url path] error:nil];
@@ -29,7 +30,8 @@ void ProcessPendingLogs(
     return;
   for (NSString* pending_log : pending_logs) {
     if ([pending_log hasSuffix:app_group::kPendingLogFileSuffix]) {
-      NSURL* file_url = [log_dir_url URLByAppendingPathComponent:pending_log];
+      NSURL* file_url =
+          [log_dir_url URLByAppendingPathComponent:pending_log isDirectory:NO];
       if (callback) {
         NSData* log_content = [file_manager contentsAtPath:[file_url path]];
         callback.get()(log_content);