Force page-action views to update after reloading an extension, by deleting

them all. Otherwise, since the view count is unchanged, the views continue to
use stale extension information and the page-action icon fails to be displayed.

Fix excessive timeout logging in WaitForPageActionVisibilityChangeTo().

BUG=http://crbug.com/21324
TEST=write page-action extension, load as unpacked, reload, verify that icon
  is shown on a matching page. Also covered by browser_tests unit test.

Review URL: http://codereview.chromium.org/202027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25996 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 2 deletions

diff --git a/chrome/browser/location_bar.h b/chrome/browser/location_bar.h
index c8e9293..6cf544d 100644
--- a/chrome/browser/location_bar.h
+++ b/chrome/browser/location_bar.h
@@ -39,7 +39,7 @@ class LocationBar {
   // Accepts the current string of text entered in the location bar.
   virtual void AcceptInput() = 0;
 
-  // Accept the current input, overriding the disposition.
+  // Accepts the current input, overriding the disposition.
   virtual void AcceptInputWithDisposition(WindowOpenDisposition) = 0;
 
   // Focuses and selects the contents of the location bar.
@@ -49,9 +49,13 @@ class LocationBar {
   // focus to it.
   virtual void FocusSearch() = 0;
 
-  // Update the state of the page actions.
+  // Updates the state of the page actions.
   virtual void UpdatePageActions() = 0;
 
+  // Called when the page-action data needs to be refreshed, e.g. when an
+  // extension is unloaded or crashes.
+  virtual void InvalidatePageActions() = 0;
+
   // Saves the state of the location bar to the specified TabContents, so that
   // it can be restored later. (Done when switching tabs).
   virtual void SaveStateToContents(TabContents* contents) = 0;
@@ -68,6 +72,9 @@ class LocationBar {
 
 class LocationBarTesting {
  public:
+  // Returns the total number of page actions in the Omnibox.
+  virtual int PageActionCount() = 0;
+
   // Returns the number of visible page actions in the Omnibox.
   virtual int PageActionVisibleCount() = 0;
 };