Mac: Generate App Mode Loader bundle + cleanup

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.
 
-#include "chrome/browser/web_applications/web_app_mac.h"
+#import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/mac/app_mode_common.h"
 #include "grit/theme_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 using ::testing::_;
 using ::testing::Return;
 using ::testing::NiceMock;
 
 namespace {
 
 class WebAppShortcutCreatorMock : public web_app::WebAppShortcutCreator {
  public:
   explicit WebAppShortcutCreatorMock(
       const ShellIntegration::ShortcutInfo& shortcut_info)
-      : WebAppShortcutCreator(FilePath(), shortcut_info) {
+      : WebAppShortcutCreator(FilePath(), shortcut_info,
+            UTF8ToUTF16("fake.cfbundleidentifier")) {
   }
 
   MOCK_CONST_METHOD1(GetDestinationPath, FilePath(const FilePath&));
 };
 
 ShellIntegration::ShortcutInfo GetShortcutInfo() {
   ShellIntegration::ShortcutInfo info;
   info.extension_id = "extension_id";
   info.title = ASCIIToUTF16("Shortcut Title");
   info.url = GURL("http://example.com/");
   return info;
 }
 
 }  // namespace
 
 namespace web_app {
 
-// This test currently fails because the Mac app loader isn't built yet.
-TEST(WebAppShortcutCreatorTest, FAILS_CreateShortcut) {
+// This test is disabled for the following reasons:
+// * The plist still isn't filled in correctly.
+// * WebAppShortcutCreator::CreateShortcut() opens a Finder window which it
+//   shouldn't be doing when run from a unit test.
+TEST(WebAppShortcutCreatorTest, DISABLED_CreateShortcut) {
   ScopedTempDir scoped_temp_dir;
   EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   FilePath dst_path = scoped_temp_dir.path().Append("a.app");
 
   ShellIntegration::ShortcutInfo info = GetShortcutInfo();
   NiceMock<WebAppShortcutCreatorMock> shortcut_creator(info);
   EXPECT_CALL(shortcut_creator, GetDestinationPath(_))
       .WillRepeatedly(Return(dst_path));
   EXPECT_TRUE(shortcut_creator.CreateShortcut());
   EXPECT_TRUE(file_util::PathExists(dst_path));
 
   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 (NSString* value in [plist allValues])
-    EXPECT_FALSE([value hasPrefix:@"@APP_"]);
+  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, CreateFailure) {
+TEST(WebAppShortcutCreatorTest, DISABLED_CreateFailure) {
   NiceMock<WebAppShortcutCreatorMock> shortcut_creator(GetShortcutInfo());
   EXPECT_CALL(shortcut_creator, GetDestinationPath(_))
       .WillRepeatedly(Return(FilePath("/non-existant/path/")));
   EXPECT_FALSE(shortcut_creator.CreateShortcut());
 }
 
 TEST(WebAppShortcutCreatorTest, UpdateIcon) {
   ScopedTempDir scoped_temp_dir;
   ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
   FilePath dst_path = scoped_temp_dir.path();
 
   ShellIntegration::ShortcutInfo info = GetShortcutInfo();
   info.favicon = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
       IDR_PRODUCT_LOGO_32).ToSkBitmap();
   WebAppShortcutCreatorMock shortcut_creator(info);
 
   shortcut_creator.UpdateIcon(dst_path);
   FilePath icon_path =
       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(info.favicon.width(), [image size].width);
   EXPECT_EQ(info.favicon.height(), [image size].height);
 }
 
 }  // namespace web_app