Move the parsing of app.launch related keys out of Extension class.

chrome/browser/extensions/convert_web_app_unittest.cc

Index: chrome/browser/extensions/convert_web_app_unittest.cc
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc
index 900c9edd31a5b28711dced1b198ec8fff444b8d2..75ef532e41f3a430c6a95ac295d30d1c6e378d78 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -16,9 +16,11 @@
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_unittest.h"
+#include "chrome/common/extensions/manifest_handler.h"

[Devlin, 2013/04/16 21:40:58]

I don't think you need the generic manifest_handler include.

 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/web_apps.h"
@@ -85,6 +87,7 @@ class ExtensionFromWebApp : public ExtensionTest {
  protected:
   virtual void SetUp() OVERRIDE {
     ExtensionTest::SetUp();
+    (new AppLaunchManifestHandler)->Register();
     (new IconsHandler)->Register();
   }
 };
@@ -139,7 +142,7 @@ TEST_F(ExtensionFromWebApp, Basic) {
   EXPECT_EQ("1978.12.11.0", extension->version()->GetString());
   EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name());
   EXPECT_EQ(UTF16ToUTF8(web_app.description), extension->description());
-  EXPECT_EQ(web_app.app_url, extension->GetFullLaunchURL());
+  EXPECT_EQ(web_app.app_url, AppLauncherInfo::GetFullLaunchURL(extension));
   EXPECT_EQ(2u, extension->GetActivePermissions()->apis().size());
   EXPECT_TRUE(extension->HasAPIPermission("geolocation"));
   EXPECT_TRUE(extension->HasAPIPermission("notifications"));
@@ -186,7 +189,7 @@ TEST_F(ExtensionFromWebApp, Minimal) {
   EXPECT_EQ("1978.12.11.0", extension->version()->GetString());
   EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name());
   EXPECT_EQ("", extension->description());
-  EXPECT_EQ(web_app.app_url, extension->GetFullLaunchURL());
+  EXPECT_EQ(web_app.app_url, AppLauncherInfo::GetFullLaunchURL(extension));
   EXPECT_EQ(0u, IconsInfo::GetIcons(extension).map().size());
   EXPECT_EQ(0u, extension->GetActivePermissions()->apis().size());
   ASSERT_EQ(1u, extension->web_extent().patterns().size());