Fix some uses of global variables in transient pages.

chrome/common/extensions/extension_messages.h

 // Copyright (c) 2012 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.
 
 // IPC messages for extensions.
 // Multiply-included message file, hence no include guard.
 
 #include "base/shared_memory.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 238 matching lines @@
 IPC_MESSAGE_CONTROL2(ExtensionMsg_ShouldUnload,
                      std::string /* extension_id */,
                      int /* sequence_id */)
 
 // If we complete a round of ShouldUnload->ShouldUnloadAck messages without the
 // lazy background page becoming active again, we are ready to unload. This
 // message tells the page to dispatch the unload event.
 IPC_MESSAGE_CONTROL1(ExtensionMsg_Unload,
                      std::string /* extension_id */)
 
+// Send to renderer once the installation mentioned on
+// ExtensionHostMsg_InlineWebstoreInstall is complete.
+IPC_MESSAGE_ROUTED3(ExtensionMsg_InlineWebstoreInstallResponse,
+                    int32 /* install id */,
+                    bool /* whether the install was successful */,
+                    std::string /* error */)
+
+// Response to the renderer for the above message.

[Yoyo Zhou, 2012/04/04 18:52:24]

"the above message" was already wrong, but change it to GetAppNotifyChannel.

[Matt Perry, 2012/04/04 19:21:44]

Done.

+IPC_MESSAGE_ROUTED3(ExtensionMsg_GetAppNotifyChannelResponse,
+                    std::string /* channel_id */,
+                    std::string /* error */,
+                    int32 /* callback_id */)
+
+// Dispatch the Port.onConnect event for message channels.
+IPC_MESSAGE_ROUTED5(ExtensionMsg_DispatchOnConnect,
+                    int /* target_port_id */,
+                    std::string /* channel_name */,
+                    std::string /* tab_json */,
+                    std::string /* source_extension_id */,
+                    std::string /* target_extension_id */)
+
+// Deliver a message sent with ExtensionHostMsg_PostMessage.
+IPC_MESSAGE_ROUTED2(ExtensionMsg_DeliverMessage,
+                    int /* target_port_id */,
+                    std::string /* message */)
+
+IPC_MESSAGE_ROUTED2(ExtensionMsg_DispatchOnDisconnect,
+                    int /* port_id */,
+                    bool /* connection_error */)
+
 // Messages sent from the renderer to the browser.
 
 // A renderer sends this message when an extension process starts an API
 // request. The browser will always respond with a ExtensionMsg_Response.
 IPC_MESSAGE_ROUTED1(ExtensionHostMsg_Request,
                     ExtensionHostMsg_Request_Params)
 
 // A renderer sends this message when an extension process starts an API
 // request. The browser will always respond with a ExtensionMsg_Response.
 IPC_MESSAGE_CONTROL2(ExtensionHostMsg_RequestForIOThread,
@@ skipping 79 matching lines @@
 IPC_MESSAGE_ROUTED1(ExtensionHostMsg_InstallApplication,
                     WebApplicationInfo)
 
 // Sent by the renderer to implement chrome.webstore.install().
 IPC_MESSAGE_ROUTED4(ExtensionHostMsg_InlineWebstoreInstall,
                     int32 /* install id */,
                     int32 /* return route id */,
                     std::string /* Web Store item ID */,
                     GURL /* requestor URL */)
 
-// Send to renderer once the installation mentioned above is complete.
-IPC_MESSAGE_ROUTED3(ExtensionMsg_InlineWebstoreInstallResponse,

[Matt Perry, 2012/04/04 00:32:42]

I moved the ExtensionMsg's up to their section.

-                    int32 /* install id */,
-                    bool /* whether the install was successful */,
-                    std::string /* error */)
-
 // Sent by the renderer when an App is requesting permission to send server
 // pushed notifications.
 IPC_MESSAGE_ROUTED4(ExtensionHostMsg_GetAppNotifyChannel,
                     GURL /* requestor_url */,
                     std::string /* client_id */,
                     int32 /* return_route_id */,
                     int32 /* callback_id */)
 
 // Optional Ack message sent to the browser to notify that the response to a
 // function has been processed.
 IPC_MESSAGE_ROUTED1(ExtensionHostMsg_ResponseAck,
                     int /* request_id */)
 
 // Response to ExtensionMsg_ShouldUnload.
 IPC_MESSAGE_CONTROL2(ExtensionHostMsg_ShouldUnloadAck,
                      std::string /* extension_id */,
                      int /* sequence_id */)
 
 // Response to ExtensionMsg_Unload, after we dispatch the unload event.
 IPC_MESSAGE_CONTROL1(ExtensionHostMsg_UnloadAck,
                      std::string /* extension_id */)
 
-// Response to the renderer for the above message.
-IPC_MESSAGE_ROUTED3(ExtensionMsg_GetAppNotifyChannelResponse,
-                    std::string /* channel_id */,
-                    std::string /* error */,
-                    int32 /* callback_id */)
+// Informs the browser to increment the keepalive count for the lazy background
+// page, keeping it alive.
+IPC_MESSAGE_CONTROL1(ExtensionHostMsg_IncrementLazyKeepaliveCount,
+                     std::string /* extension_id */)
 
-// Dispatch the Port.onConnect event for message channels.
-IPC_MESSAGE_ROUTED5(ExtensionMsg_DispatchOnConnect,
-                    int /* target_port_id */,
-                    std::string /* channel_name */,
-                    std::string /* tab_json */,
-                    std::string /* source_extension_id */,
-                    std::string /* target_extension_id */)
+// Informs the browser there is one less thing keeping the lazy background page
+// alive.
+IPC_MESSAGE_CONTROL1(ExtensionHostMsg_DecrementLazyKeepaliveCount,
+                     std::string /* extension_id */)
 
-// Deliver a message sent with ExtensionHostMsg_PostMessage.
-IPC_MESSAGE_ROUTED2(ExtensionMsg_DeliverMessage,
-                    int /* target_port_id */,
-                    std::string /* message */)
-
-IPC_MESSAGE_ROUTED2(ExtensionMsg_DispatchOnDisconnect,
-                    int /* port_id */,
-                    bool /* connection_error */)
+// Fetches a globally unique ID (for the lifetime of the browser) from the
+// browser process.
+IPC_SYNC_MESSAGE_CONTROL0_1(ExtensionHostMsg_GenerateUniqueID,
+                            int /* unique_id */)