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, 2 insertions, 0 deletions

diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 3fdfcdc..a9e0a54 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -145,6 +145,7 @@ class LocationBarView : public LocationBar,
   virtual void FocusLocation();
   virtual void FocusSearch();
   virtual void UpdatePageActions();
+  virtual void InvalidatePageActions();
   virtual void SaveStateToContents(TabContents* contents);
   virtual void Revert();
   virtual AutocompleteEditView* location_entry() {
@@ -153,6 +154,7 @@ class LocationBarView : public LocationBar,
   virtual LocationBarTesting* GetLocationBarForTesting() { return this; }
 
   // Overridden from LocationBarTesting:
+  virtual int PageActionCount() { return page_action_image_views_.size(); }
   virtual int PageActionVisibleCount();
 
   static const int kVertMargin;