Extension API Renaming/Consistency changes

chrome/test/data/extensions/samples/subscribe_page_action/background.html

Index: chrome/test/data/extensions/samples/subscribe_page_action/background.html
diff --git a/chrome/test/data/extensions/samples/subscribe_page_action/background.html b/chrome/test/data/extensions/samples/subscribe_page_action/background.html
index 4d14440ba9d112990555bef141313888f49ec283..e77d2e436fd8d7fffe0fa7440867e41eba1da2de 100644
--- a/chrome/test/data/extensions/samples/subscribe_page_action/background.html
+++ b/chrome/test/data/extensions/samples/subscribe_page_action/background.html
@@ -33,9 +33,10 @@
   });
 
   // Chrome will call into us when the user clicks on the icon in the OmniBox.
-  chrome.pageActions["RssPageAction"].addListener(function(reply) {
+  chrome.pageActions["RssPageAction"].addListener(function(pageActionId,
+      pageActionInfo) {
     chrome.windows.getCurrent(function(window) {
-      chrome.tabs.get(reply.data.tabId, function(tab) {
+      chrome.tabs.get(pageActionInfo.tabId, function(tab) {
         // We need to know if we are the active window, because the tab may
         // have moved to another window and we don't want to execute this
         // action multiple times.
@@ -43,7 +44,7 @@
           // Create a new tab showing the subscription page with the right
           // feed URL.
           chrome.tabs.create({url: "subscribe.html?" +
-                                       feedData[reply.data.tabId].feedUrl,
+                                       feedData[pageActionInfo.tabId].feedUrl,
                              windowId: window.windowId});
         }
       });