Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe...

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

Index: chrome/test/data/extensions/samples/test_page_action/background.html
===================================================================
--- chrome/test/data/extensions/samples/test_page_action/background.html	(revision 29822)
+++ chrome/test/data/extensions/samples/test_page_action/background.html	(working copy)
@@ -14,12 +14,12 @@
       chrome.pageAction.show(info.tabId);
     } else {
       chrome.pageAction.hide(info.tabId);
-      setTimeout(function() { chrome.pageAction.show(info.tabId); }, 1000);
+      setTimeout(function() { chrome.pageAction.show(info.tabId); }, 200);
     }
     chrome.pageAction.setTitle({title: "click:" + clicks, tabId: info.tabId});
     chrome.pageAction.setBadgeTextColor({
       tabId: info.tabId,
-      color: [0, 255, clicks * 50, 255]
+      color: [255, 255, clicks * 50, 255]
     });
     chrome.pageAction.setBadgeBackgroundColor({
       tabId: info.tabId,
@@ -27,7 +27,7 @@
     });
     chrome.pageAction.setBadgeText({
       tabId: info.tabId,
-      text: clicks + ""
+      text: i + ""
     });
 
     // We only have 2 icons, but cycle through 3 icons to test the
Property changes on: chrome\test\data\extensions\samples\test_page_action\background.html
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/test/data/extensions/samples/test_page_action/background.html:r29556