Recreate shortcuts on app update.

chrome/browser/web_applications/web_app_mac_unittest.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 <sys/xattr.h>
 #include <errno.h>
@@ skipping 12 matching lines @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 using ::testing::_;
 using ::testing::Return;
 using ::testing::NiceMock;
 
 namespace {
 
+const char kFakeChromeBundleId[] = "fake.cfbundleidentifier";
+
 class WebAppShortcutCreatorMock : public web_app::WebAppShortcutCreator {
  public:
   explicit WebAppShortcutCreatorMock(
       const ShellIntegration::ShortcutInfo& shortcut_info)
-      : WebAppShortcutCreator(base::FilePath("/fake/path"), shortcut_info,
-            UTF8ToUTF16("fake.cfbundleidentifier")) {
+      : WebAppShortcutCreator(base::FilePath("/fake/path"),
+                              shortcut_info,
+                              kFakeChromeBundleId) {
   }
 
   MOCK_CONST_METHOD0(GetDestinationPath, base::FilePath());
-  MOCK_CONST_METHOD1(RevealGeneratedBundleInFinder,
-                     void (const base::FilePath&));
+  MOCK_CONST_METHOD0(RevealAppShimInFinder, void());
+  MOCK_CONST_METHOD1(GetAppBundleById, base::FilePath(const std::string&));
 };
 
 ShellIntegration::ShortcutInfo GetShortcutInfo() {
   ShellIntegration::ShortcutInfo info;
-  info.extension_id = "extension_id";
+  info.extension_id = "extensionid";
   info.extension_path = base::FilePath("/fake/extension/path");
   info.title = ASCIIToUTF16("Shortcut Title");
   info.url = GURL("http://example.com/");
-  info.profile_path = base::FilePath("Default");
+  info.profile_path = base::FilePath("Profile 1");
   info.profile_name = "profile name";
   return info;
 }
 
 }  // namespace
 
 namespace web_app {
 
 TEST(WebAppShortcutCreatorTest, CreateShortcut) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
 
   ShellIntegration::ShortcutInfo info = GetShortcutInfo();
 
   base::FilePath dst_folder = scoped_temp_dir.path();
   base::FilePath dst_path = dst_folder.Append(
       info.profile_path.value() + " " + info.extension_id + ".app");
 
   NiceMock<WebAppShortcutCreatorMock> shortcut_creator(info);
   EXPECT_CALL(shortcut_creator, GetDestinationPath())
       .WillRepeatedly(Return(dst_folder));
-  EXPECT_CALL(shortcut_creator, RevealGeneratedBundleInFinder(dst_path));
+  EXPECT_CALL(shortcut_creator, RevealAppShimInFinder());
 
   EXPECT_TRUE(shortcut_creator.CreateShortcut());
   EXPECT_TRUE(file_util::PathExists(dst_path));
-  EXPECT_EQ(dst_path.value(), shortcut_creator.GetShortcutPath().value());
+  EXPECT_EQ(dst_path.BaseName(), shortcut_creator.GetShortcutName());
 
   base::FilePath plist_path = dst_path.Append("Contents").Append("Info.plist");
   NSDictionary* plist = [NSDictionary dictionaryWithContentsOfFile:
       base::mac::FilePathToNSString(plist_path)];
   EXPECT_NSEQ(base::SysUTF8ToNSString(info.extension_id),
               [plist objectForKey:app_mode::kCrAppModeShortcutIDKey]);
   EXPECT_NSEQ(base::SysUTF16ToNSString(info.title),
               [plist objectForKey:app_mode::kCrAppModeShortcutNameKey]);
   EXPECT_NSEQ(base::SysUTF8ToNSString(info.url.spec()),
               [plist objectForKey:app_mode::kCrAppModeShortcutURLKey]);
 
   // Make sure all values in the plist are actually filled in.
   for (id key in plist) {
     id value = [plist valueForKey:key];
     if (!base::mac::ObjCCast<NSString>(value))
       continue;
 
     EXPECT_EQ([value rangeOfString:@"@APP_"].location, NSNotFound)
         << [key UTF8String] << ":" << [value UTF8String];
   }
 }
 
+TEST(WebAppShortcutCreatorTest, UpdateShortcuts) {
+  base::ScopedTempDir scoped_temp_dir;
+  EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
+  base::ScopedTempDir scoped_temp_dir_other;
+  EXPECT_TRUE(scoped_temp_dir_other.CreateUniqueTempDir());
+
+  ShellIntegration::ShortcutInfo info = GetShortcutInfo();
+
+  base::FilePath app_name(
+      info.profile_path.value() + " " + info.extension_id + ".app");
+  base::FilePath dst_folder = scoped_temp_dir.path();
+  base::FilePath other_folder = scoped_temp_dir_other.path();
+
+  NiceMock<WebAppShortcutCreatorMock> shortcut_creator(info);
+  EXPECT_CALL(shortcut_creator, GetDestinationPath())
+      .WillRepeatedly(Return(dst_folder));
+
+  std::string expected_bundle_id = kFakeChromeBundleId;
+  expected_bundle_id += ".app.Profile-1." + info.extension_id;
+  EXPECT_CALL(shortcut_creator, GetAppBundleById(expected_bundle_id))

[tapted, 2013/06/18 06:54:59]

Can you test the failure case, with GetAppBundleById returning an empty
base::FilePath() ?

[jackhou1, 2013/06/18 08:32:40]

Done.

+      .WillRepeatedly(Return(other_folder.Append(app_name)));
+
+  shortcut_creator.BuildShortcut(other_folder.Append(app_name));
+
+  EXPECT_TRUE(file_util::Delete(
+      other_folder.Append(app_name).Append("Contents"), true));
+
+  EXPECT_TRUE(shortcut_creator.UpdateShortcuts());
+  EXPECT_FALSE(file_util::PathExists(dst_folder.Append(app_name)));
+  EXPECT_TRUE(file_util::PathExists(
+      other_folder.Append(app_name).Append("Contents")));
+}
+
 TEST(WebAppShortcutCreatorTest, RunShortcut) {
   base::ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
 
   ShellIntegration::ShortcutInfo info = GetShortcutInfo();
 
   base::FilePath dst_folder = scoped_temp_dir.path();
   base::FilePath dst_path = dst_folder.Append(
       info.profile_path.value() + " " + info.extension_id + ".app");
 
   NiceMock<WebAppShortcutCreatorMock> shortcut_creator(info);
   EXPECT_CALL(shortcut_creator, GetDestinationPath())
       .WillRepeatedly(Return(dst_folder));
-  EXPECT_CALL(shortcut_creator, RevealGeneratedBundleInFinder(dst_path));
 
   EXPECT_TRUE(shortcut_creator.CreateShortcut());
   EXPECT_TRUE(file_util::PathExists(dst_path));
 
   ssize_t status = getxattr(
       dst_path.value().c_str(), "com.apple.quarantine", NULL, 0, 0, 0);
   EXPECT_EQ(-1, status);
   EXPECT_EQ(ENOATTR, errno);
 }
 
@@ skipping 27 matching lines @@
       dst_path.Append("Contents").Append("Resources").Append("app.icns");
 
   scoped_nsobject<NSImage> image([[NSImage alloc] initWithContentsOfFile:
       base::mac::FilePathToNSString(icon_path)]);
   EXPECT_TRUE(image);
   EXPECT_EQ(product_logo.Width(), [image size].width);
   EXPECT_EQ(product_logo.Height(), [image size].height);
 }
 
 }  // namespace web_app