Implement web app definition parsing.

chrome/browser/extensions/convert_web_app_unittest.cc

 // Copyright (c) 2010 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/extensions/convert_web_app.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
+#include "chrome/common/web_apps.h"
 #include "gfx/codec/png_codec.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/dom_operations.h"
 #include "webkit/glue/image_decoder.h"
 
 namespace {
 
 // Returns an icon info corresponding to a canned icon.
-webkit_glue::WebApplicationInfo::IconInfo GetIconInfo(const GURL& url,
-                                                      int size) {
-  webkit_glue::WebApplicationInfo::IconInfo result;
+WebApplicationInfo::IconInfo GetIconInfo(const GURL& url, int size) {
+  WebApplicationInfo::IconInfo result;
 
   FilePath icon_file;
   if (!PathService::Get(chrome::DIR_TEST_DATA, &icon_file)) {
     ADD_FAILURE() << "Could not get test data directory.";
     return result;
   }
 
   icon_file = icon_file.AppendASCII("extensions")
                        .AppendASCII("convert_web_app")
                        .AppendASCII(StringPrintf("%i.png", size));
@@ skipping 39 matching lines @@
                 GetTestTime(2010, 1, 1, 0, 0, 0, 0)));
   EXPECT_EQ("2010.12.31.22111",
             ConvertTimeToExtensionVersion(
                 GetTestTime(2010, 12, 31, 8, 5, 50, 500)));
   EXPECT_EQ("2010.10.1.65535",
             ConvertTimeToExtensionVersion(
                 GetTestTime(2010, 10, 1, 23, 59, 59, 999)));
 }
 
 TEST(ExtensionFromWebApp, Basic) {
-  webkit_glue::WebApplicationInfo web_app;
+  WebApplicationInfo web_app;
   web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json");
   web_app.title = ASCIIToUTF16("Gearpad");
   web_app.description = ASCIIToUTF16("The best text editor in the universe!");
   web_app.app_url = GURL("http://aaronboodman.com/gearpad/");
-  web_app.permissions.push_back("geolocation");
-  web_app.permissions.push_back("notifications");
+  web_app.privileges.push_back("geolocation");
+  web_app.privileges.push_back("notifications");
   web_app.urls.push_back(GURL("http://aaronboodman.com/gearpad/"));
 
   const int sizes[] = {16, 48, 128};
   for (size_t i = 0; i < arraysize(sizes); ++i) {
     GURL icon_url(web_app.app_url.Resolve(StringPrintf("%i.png", sizes[i])));
     web_app.icons.push_back(GetIconInfo(icon_url, sizes[i]));
   }
 
   scoped_refptr<Extension> extension = ConvertWebAppToExtension(
       web_app, GetTestTime(1978, 12, 11, 0, 0, 0, 0));
@@ skipping 26 matching lines @@
               extension->icons().Get(web_app.icons[i].width,
                                      ExtensionIconSet::MATCH_EXACTLY));
     ExtensionResource resource = extension->GetIconResource(
         web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY);
     ASSERT_TRUE(!resource.empty());
     EXPECT_TRUE(file_util::PathExists(resource.GetFilePath()));
   }
 }
 
 TEST(ExtensionFromWebApp, Minimal) {
-  webkit_glue::WebApplicationInfo web_app;
+  WebApplicationInfo web_app;
   web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json");
   web_app.title = ASCIIToUTF16("Gearpad");
   web_app.app_url = GURL("http://aaronboodman.com/gearpad/");
 
   scoped_refptr<Extension> extension = ConvertWebAppToExtension(
       web_app, GetTestTime(1978, 12, 11, 0, 0, 0, 0));
   ASSERT_TRUE(extension.get());
 
   ScopedTempDir extension_dir;
   extension_dir.Set(extension->path());
 
   EXPECT_TRUE(extension->is_app());
   EXPECT_TRUE(extension->is_hosted_app());
   EXPECT_FALSE(extension->is_packaged_app());
 
   EXPECT_EQ("lJqm1+jncOHClAuwif1QxNJKfeV9Fbl9IBZx7FkNwkA=",
             extension->public_key());
   EXPECT_EQ("ncnbaadanljoanockmphfdkimpdedemj", extension->id());
   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(0u, extension->icons().map().size());
   EXPECT_EQ(0u, extension->api_permissions().size());
   ASSERT_EQ(1u, extension->web_extent().patterns().size());
   EXPECT_EQ("*://aaronboodman.com/*",
             extension->web_extent().patterns()[0].GetAsString());
 }