Merge Android RetrieveWebappInformation and Extensions GetApplicationInfo.

chrome/renderer/web_apps.h

Index: chrome/renderer/web_apps.h
diff --git a/chrome/renderer/web_apps.h b/chrome/renderer/web_apps.h
index e88e2fd9c486329d8e6d7947bf92785828d49c57..e21a300045f4d08355aa3bac78ca1fdb12131677 100644
--- a/chrome/renderer/web_apps.h
+++ b/chrome/renderer/web_apps.h
@@ -27,18 +27,11 @@ namespace web_apps {
 bool ParseIconSizes(const base::string16& text, std::vector<gfx::Size>* sizes,
                     bool* is_any);
 
-// Parses |web_app| information out of the document in frame. Returns true on
-// success, or false and |error| on failure. Note that the document may contain
-// no web application information, in which case |web_app| is unchanged and the
-// function returns true.
-//
-// Documents can also contain a link to a application 'definition'. In this case
-// web_app will have manifest_url set and nothing else. The caller must fetch
-// this URL and pass the result to ParseWebAppFromDefinitionFile() for further
-// processing.
-bool ParseWebAppFromWebDocument(blink::WebFrame* frame,
-                                WebApplicationInfo* web_app,
-                                base::string16* error);
+// Parses |app_info| information out of the document in WebFrame. Note that the
+// document may contain no web application information, in which case |app_info|
+// is unchanged.
+void ParseWebAppFromWebDocument(blink::WebFrame* frame,
+                                WebApplicationInfo* app_info);
 
 }  // namespace web_apps