Merge Android RetrieveWebappInformation and Extensions GetApplicationInfo.

chrome/common/extensions/chrome_extension_messages.h

Index: chrome/common/extensions/chrome_extension_messages.h
diff --git a/chrome/common/extensions/chrome_extension_messages.h b/chrome/common/extensions/chrome_extension_messages.h
index d6414d599d1ecf75b03954f6de63a2dec8970f92..cbc5f2065e8ab9546840e7287bf2a19a699c3fa5 100644
--- a/chrome/common/extensions/chrome_extension_messages.h
+++ b/chrome/common/extensions/chrome_extension_messages.h
@@ -14,7 +14,6 @@
 #include "base/values.h"
 #include "chrome/common/extensions/api/webstore/webstore_api_constants.h"
 #include "chrome/common/extensions/webstore_install_result.h"
-#include "chrome/common/web_application_info.h"
 #include "extensions/common/stack_frame.h"
 #include "ipc/ipc_message_macros.h"
 #include "url/gurl.h"
@@ -26,26 +25,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(extensions::api::webstore::InstallStage,
 IPC_ENUM_TRAITS_MAX_VALUE(extensions::webstore_install::Result,
                           extensions::webstore_install::RESULT_LAST)
 
-IPC_STRUCT_TRAITS_BEGIN(WebApplicationInfo::IconInfo)
-  IPC_STRUCT_TRAITS_MEMBER(url)
-  IPC_STRUCT_TRAITS_MEMBER(width)
-  IPC_STRUCT_TRAITS_MEMBER(height)
-  IPC_STRUCT_TRAITS_MEMBER(data)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(WebApplicationInfo)
-  IPC_STRUCT_TRAITS_MEMBER(title)
-  IPC_STRUCT_TRAITS_MEMBER(description)
-  IPC_STRUCT_TRAITS_MEMBER(app_url)
-  IPC_STRUCT_TRAITS_MEMBER(icons)
-IPC_STRUCT_TRAITS_END()
-
 // Messages sent from the browser to the renderer.
 
-// Requests application info for the page. The renderer responds back with
-// ExtensionHostMsg_DidGetApplicationInfo.
-IPC_MESSAGE_ROUTED0(ChromeExtensionMsg_GetApplicationInfo)
-
 // Toggles visual muting of the render view area. This is on when a constrained
 // window is showing.
 IPC_MESSAGE_ROUTED1(ChromeViewMsg_SetVisuallyDeemphasized,
@@ -79,6 +60,3 @@ IPC_MESSAGE_ROUTED5(ExtensionHostMsg_InlineWebstoreInstall,
                     std::string /* Web Store item ID */,
                     GURL /* requestor URL */,
                     int /* listeners_mask */)
-
-IPC_MESSAGE_ROUTED1(ChromeExtensionHostMsg_DidGetApplicationInfo,
-                    WebApplicationInfo)