Mac: Enable WebAppShortcutCreatorTest.CreateShortcut unit test

chrome/browser/web_applications/web_app_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 62 matching lines @@
 
   if (!UpdateIcon(staging_path))
     return false;
 
   FilePath dst_path = GetDestinationPath(app_file_name);
   if (!file_util::CopyDirectory(staging_path, dst_path, true)) {
     LOG(ERROR) << "Copying app to dst path: " << dst_path.value() << " failed";
     return false;
   }
 
-  [[NSWorkspace sharedWorkspace]
-      selectFile:base::mac::FilePathToNSString(dst_path)
-      inFileViewerRootedAtPath:nil];
+  RevealGeneratedBundleInFinder(dst_path);
+
   return true;
 }
 
 FilePath WebAppShortcutCreator::GetAppLoaderPath() const {
   return base::mac::PathForFrameworkBundleResource(
       base::mac::NSToCFCast(@"app_mode_loader.app"));
 }
 
 FilePath WebAppShortcutCreator::GetDestinationPath(
     const FilePath& app_file_name) const {
   FilePath path;
   if (base::mac::GetLocalDirectory(NSApplicationDirectory, &path) &&
       file_util::PathIsWritable(path)) {
     return path;
   }
 
   if (base::mac::GetUserDirectory(NSApplicationDirectory, &path))
     return path;
 
   return FilePath();
 }
 
 bool WebAppShortcutCreator::UpdatePlist(const FilePath& app_path) const {
   NSString* plist_path = base::mac::FilePathToNSString(
       app_path.Append("Contents").Append("Info.plist"));
-  NSMutableDictionary* dict =
+
+  NSString* extension_id = base::SysUTF8ToNSString(info_.extension_id);
+  NSString* extension_title = base::SysUTF16ToNSString(info_.title);
+  NSString* extension_url = base::SysUTF8ToNSString(info_.url.spec());
+  NSString* chrome_bundle_id = base::SysUTF16ToNSString(chrome_bundle_id_);
+  NSDictionary* replacement_dict =
+      [NSDictionary dictionaryWithObjectsAndKeys:
+          extension_id, app_mode::kShortcutIdPlaceholder,
+          extension_title, app_mode::kShortcutNamePlaceholder,
+          extension_url, app_mode::kShortcutURLPlaceholder,
+          chrome_bundle_id, app_mode::kShortcutBrowserBundleIDPlaceholder,
+          nil];
+
+  NSMutableDictionary* plist =
       [NSMutableDictionary dictionaryWithContentsOfFile:plist_path];
+  NSArray* keys = [plist allKeys];
 
-  [dict setObject:GetBundleIdentifier(dict)
-           forKey:base::mac::CFToNSCast(kCFBundleIdentifierKey)];
-  [dict setObject:base::SysUTF8ToNSString(info_.extension_id)
-           forKey:app_mode::kCrAppModeShortcutIDKey];
-  [dict setObject:base::SysUTF16ToNSString(info_.title)
-           forKey:app_mode::kCrAppModeShortcutNameKey];
-  [dict setObject:base::SysUTF8ToNSString(info_.url.spec())
-           forKey:app_mode::kCrAppModeShortcutURLKey];
-  [dict setObject:base::mac::FilePathToNSString(user_data_dir_)
-           forKey:app_mode::kCrAppModeUserDataDirKey];
-  [dict setObject:base::mac::FilePathToNSString(info_.extension_path)
-           forKey:app_mode::kCrAppModeExtensionPathKey];
-  [dict setObject:base::SysUTF16ToNSString(chrome_bundle_id_)
-           forKey:app_mode::kBrowserBundleIDKey];
-  return [dict writeToFile:plist_path atomically:YES];
+  // 1. Fill in variables.
+  for (id key in keys) {
+    NSString* value = [plist valueForKey:key];
+    if (![value isKindOfClass:[NSString class]] || [value length] < 2)
+      continue;
+
+    // Remove leading and trailing '@'s.
+    NSString* variable =
+        [value substringWithRange:NSMakeRange(1, [value length] - 2)];
+
+    NSString* substitution = [replacement_dict valueForKey:variable];
+    if (substitution)
+      [plist setObject:substitution forKey:key];
+  }
+
+  // 2. Fill in other values.
+  [plist setObject:GetBundleIdentifier(plist)
+            forKey:base::mac::CFToNSCast(kCFBundleIdentifierKey)];
+  [plist setObject:base::mac::FilePathToNSString(user_data_dir_)
+            forKey:app_mode::kCrAppModeUserDataDirKey];
+  [plist setObject:base::mac::FilePathToNSString(info_.extension_path)
+            forKey:app_mode::kCrAppModeExtensionPathKey];
+  return [plist writeToFile:plist_path atomically:YES];
 }
 
 bool WebAppShortcutCreator::UpdateIcon(const FilePath& app_path) const {
   // TODO(sail): Add support for multiple icon sizes.
   if (info_.favicon.empty() || info_.favicon.width() != 32 ||
       info_.favicon.height() != 32) {
     return true;
   }
 
   NSBitmapImageRep* image_rep = SkBitmapToImageRep(info_.favicon);
@@ skipping 27 matching lines @@
   NSString* extension_id = base::SysUTF8ToNSString(info_.extension_id);
   NSString* placeholder =
       [NSString stringWithFormat:@"@%@@", app_mode::kShortcutIdPlaceholder];
   NSString* bundle_id =
       [bundle_id_template
           stringByReplacingOccurrencesOfString:placeholder
                                     withString:extension_id];
   return bundle_id;
 }
 
+void WebAppShortcutCreator::RevealGeneratedBundleInFinder(
+    const FilePath& generated_bundle) const {
+  [[NSWorkspace sharedWorkspace]
+                    selectFile:base::mac::FilePathToNSString(generated_bundle)
+      inFileViewerRootedAtPath:nil];
+}
+
 }  // namespace
 
 namespace web_app {
 namespace internals {
 
 void CreateShortcutTask(const FilePath& web_app_path,
                         const FilePath& profile_path,
                         const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   string16 bundle_id = UTF8ToUTF16(base::mac::BaseBundleID());
   WebAppShortcutCreator shortcut_creator(web_app_path, shortcut_info,
                             bundle_id);
   shortcut_creator.CreateShortcut();
 }
 
 }  // namespace internals
 }  // namespace web_app