Add a function to create a bookmark app from a WebApplicationInfo.

Add a function to create a bookmark app from a WebApplicationInfo.

This CL adds a function which installs a bookmark app that is created
from a WebApplicationInfo. This is part of an effort to consolidate
code that deals with bookmark apps and write tests for them and is part of
laying the groundwork for syncing of bookmark apps.

BUG=318607
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260823

[benwells, 2014-03-21 01:53:36]

lgtm

[calamity, 2014-03-21 03:08:58]

The CQ bit was checked by calamity@chromium.org

[calamity, 2014-03-21 03:09:01]

The CQ bit was unchecked by calamity@chromium.org

[calamity, 2014-03-21 03:09:18]

+sky for OWNERS

[sky, 2014-03-21 15:57:28]

LGTM

[calamity, 2014-03-27 01:38:54]

The CQ bit was checked by calamity@chromium.org

[commit-bot: I haz the power, 2014-03-27 01:39:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/calamity@chromium.org/202523011/70001

[commit-bot: I haz the power, 2014-03-27 01:40:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-27 01:40:07]

Failed to apply patch for
chrome/browser/extensions/bookmark_app_helper_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/extensions/bookmark_app_helper_unittest.cc
  Hunk #2 FAILED at 18.
  Hunk #3 succeeded at 65 (offset 2 lines).
  Hunk #4 succeeded at 201 (offset 5 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/extensions/bookmark_app_helper_unittest.cc.rej

Patch:       chrome/browser/extensions/bookmark_app_helper_unittest.cc
Index: chrome/browser/extensions/bookmark_app_helper_unittest.cc
diff --git a/chrome/browser/extensions/bookmark_app_helper_unittest.cc
b/chrome/browser/extensions/bookmark_app_helper_unittest.cc
index
f0c93c55e8a7fc8155b753d8bf48f4a2c1bcf5e8..eec1068eebc3f78a05b2be15a1b01a2b9cce881e
100644
--- a/chrome/browser/extensions/bookmark_app_helper_unittest.cc
+++ b/chrome/browser/extensions/bookmark_app_helper_unittest.cc
@@ -10,6 +10,7 @@
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/test/base/testing_profile.h"
+#include "extensions/browser/extension_registry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -17,9 +18,11 @@ namespace {
 
 const char kAppUrl[] = "http://www.chromium.org";
 const char kAppTitle[] = "Test title";
+const char kAlternativeAppTitle[] = "Different test title";
 const char kAppDescription[] = "Test description";
 
-const int kIconSmallSize = extension_misc::EXTENSION_ICON_SMALL;
+const int kIconSmallSize = extension_misc::EXTENSION_ICON_BITTY;
+const int kIconLargeSize = extension_misc::EXTENSION_ICON_LARGE;
 
 class BookmarkAppHelperTest : public testing::Test {
  public:
@@ -62,6 +65,14 @@ void ValidateBitmapSizeAndColor(SkBitmap bitmap, int size,
SkColor color) {
   EXPECT_EQ(size, bitmap.height());
 }
 
+WebApplicationInfo::IconInfo CreateIconInfoWithBitmap(int size, SkColor color)
{
+  WebApplicationInfo::IconInfo icon_info;
+  icon_info.width = size;
+  icon_info.height = size;
+  icon_info.data = CreateSquareBitmapWithColor(size, color);
+  return icon_info;
+}
+
 }  // namespace
 
 namespace extensions {
@@ -187,4 +198,50 @@ TEST_F(BookmarkAppHelperTest, GenerateIcons) {
   }
 }
 
+TEST_F(BookmarkAppHelperExtensionServiceTest, CreateAndUpdateBookmarkApp) {
+  EXPECT_EQ(0u, registry_->enabled_extensions().size());
+  WebApplicationInfo web_app_info;
+  web_app_info.app_url = GURL(kAppUrl);
+  web_app_info.title = base::UTF8ToUTF16(kAppTitle);
+  web_app_info.description = base::UTF8ToUTF16(kAppDescription);
+  web_app_info.icons.push_back(
+      CreateIconInfoWithBitmap(kIconSmallSize, SK_ColorRED));
+
+  extensions::CreateOrUpdateBookmarkApp(service_, web_app_info);
+  base::RunLoop().RunUntilIdle();
+
+  {
+    EXPECT_EQ(1u, registry_->enabled_extensions().size());
+    const Extension* extension = service_->extensions()->begin()->get();
+    EXPECT_TRUE(extension->from_bookmark());
+    EXPECT_EQ(kAppTitle, extension->name());
+    EXPECT_EQ(kAppDescription, extension->description());
+    EXPECT_EQ(GURL(kAppUrl), AppLaunchInfo::GetLaunchWebURL(extension));
+    EXPECT_FALSE(extensions::IconsInfo::GetIconResource(
+                     extension, kIconSmallSize,
ExtensionIconSet::MATCH_EXACTLY)
+                     .empty());
+  }
+
+  web_app_info.title = base::UTF8ToUTF16(kAlternativeAppTitle);
+  web_app_info.icons[0] = CreateIconInfoWithBitmap(kIconLargeSize,
SK_ColorRED);
+
+  extensions::CreateOrUpdateBookmarkApp(service_, web_app_info);
+  base::RunLoop().RunUntilIdle();
+
+  {
+    EXPECT_EQ(1u, registry_->enabled_extensions().size());
+    const Extension* extension = service_->extensions()->begin()->get();
+    EXPECT_TRUE(extension->from_bookmark());
+    EXPECT_EQ(kAlternativeAppTitle, extension->name());
+    EXPECT_EQ(kAppDescription, extension->description());
+    EXPECT_EQ(GURL(kAppUrl), AppLaunchInfo::GetLaunchWebURL(extension));
+    EXPECT_TRUE(extensions::IconsInfo::GetIconResource(
+                    extension, kIconSmallSize, ExtensionIconSet::MATCH_EXACTLY)
+                    .empty());
+    EXPECT_FALSE(extensions::IconsInfo::GetIconResource(
+                     extension, kIconLargeSize,
ExtensionIconSet::MATCH_EXACTLY)
+                     .empty());
+  }
+}
+
 }  // namespace extensions

[calamity, 2014-04-01 02:20:50]

The CQ bit was checked by calamity@chromium.org

[commit-bot: I haz the power, 2014-04-01 02:22:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/calamity@chromium.org/202523011/140001

[commit-bot: I haz the power, 2014-04-01 03:58:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-01 03:58:15]

Retried try job too often on android_clang_dbg for step(s) slave_steps
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...

[calamity, 2014-04-01 05:32:48]

The CQ bit was checked by calamity@chromium.org

[commit-bot: I haz the power, 2014-04-01 05:33:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/calamity@chromium.org/202523011/180001

[commit-bot: I haz the power, 2014-04-01 06:03:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-01 06:03:28]

Try jobs failed on following builders:
  tryserver.chromium on win_chromium_compile_dbg

[calamity, 2014-04-01 06:48:11]

The CQ bit was checked by calamity@chromium.org

[commit-bot: I haz the power, 2014-04-01 06:48:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/calamity@chromium.org/202523011/200001

[commit-bot: I haz the power, 2014-04-01 09:43:33]

Change committed as 260823