Implement web app definition parsing.

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 68d5dbd8d8893834e22cec958e258a233b0b763a..86ef1c21b37cdaa751269bee86efe69987ca1b28 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -20,18 +20,17 @@
 #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)) {
@@ -91,13 +90,13 @@ TEST(ExtensionFromWebApp, GenerateVersion) {
 }
 
 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};
@@ -144,7 +143,7 @@ TEST(ExtensionFromWebApp, Basic) {
 }
 
 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/");