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 b915c250d6ea23e3d3153a32039170fd3c63bf43..802adff66a72c3823859d6d9a6d5491594f32b31 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -17,6 +17,7 @@
 #include "base/version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/icons/icons_handler.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension.h"

[Joe Thomas, 2013/03/01 23:26:57]

I will include chrome/common/extensions/manifest_handler.h here.

 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
@@ -80,8 +81,21 @@ base::Time GetTestTime(int year, int month, int day, int hour, int minute,
 
 }  // namespace
 
+class ExtensionFromWebApp : public ::testing::Test {
+ public:
+  virtual void SetUp() OVERRIDE {
+    testing::Test::SetUp();
+    (new AppLaunchManifestHandler)->Register();
+    (new IconsHandler)->Register();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    ManifestHandler::ClearRegistryForTesting();
+    testing::Test::TearDown();
+  }
+};
 
-TEST(ExtensionFromWebApp, GenerateVersion) {
+TEST_F(ExtensionFromWebApp, GenerateVersion) {
   EXPECT_EQ("2010.1.1.0",
             ConvertTimeToExtensionVersion(
                 GetTestTime(2010, 1, 1, 0, 0, 0, 0)));
@@ -93,7 +107,7 @@ TEST(ExtensionFromWebApp, GenerateVersion) {
                 GetTestTime(2010, 10, 1, 23, 59, 59, 999)));
 }
 
-TEST(ExtensionFromWebApp, Basic) {
+TEST_F(ExtensionFromWebApp, Basic) {
   base::ScopedTempDir extensions_dir;
   ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
 
@@ -130,7 +144,7 @@ TEST(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"));
@@ -150,7 +164,7 @@ TEST(ExtensionFromWebApp, Basic) {
   }
 }
 
-TEST(ExtensionFromWebApp, Minimal) {
+TEST_F(ExtensionFromWebApp, Minimal) {
   base::ScopedTempDir extensions_dir;
   ASSERT_TRUE(extensions_dir.CreateUniqueTempDir());
 
@@ -177,7 +191,7 @@ TEST(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());