Clean up NOTIFICATION_EXTENSION_PAGE_ACTION_[ COUNT | VISIBILITY ]_CHANGED

chrome/browser/extensions/page_action_browsertest.cc

 // 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.
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
 
 namespace extensions {
 namespace {
 
 const std::string kFeedPage = "files/feeds/feed.html";
@@ skipping 77 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, UnloadPageAction) {
   ASSERT_TRUE(test_server()->Start());
 
   base::FilePath extension_path(
       test_data_dir_.AppendASCII("subscribe_page_action"));
   ASSERT_TRUE(LoadExtension(extension_path));
 
   // Navigation prompts the location bar to load page actions.
   GURL feed_url = test_server()->GetURL(kFeedPage);
   ui_test_utils::NavigateToURL(browser(), feed_url);
-  ASSERT_TRUE(WaitForPageActionCountChangeTo(1));
+  LocationBarTesting* location_bar =
+      browser()->window()->GetLocationBar()->GetLocationBarForTesting();
+  EXPECT_EQ(1, location_bar->PageActionCount());
 
   UnloadExtension(last_loaded_extension_id());
 
   // Make sure the page action goes away when it's unloaded.
-  ASSERT_TRUE(WaitForPageActionCountChangeTo(0));
+  EXPECT_EQ(0, location_bar->PageActionCount());
 }
 
 // Tests that we can load page actions in the Omnibox.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionRefreshCrash) {
   base::TimeTicks start_time = base::TimeTicks::Now();
 
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
 
   size_t size_before = service->extensions()->size();
@@ skipping 72 matching lines @@
   int tab_id = ExtensionTabUtil::GetTabId(
       browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_STREQ(base::WideToUTF8(L"Hreggvi\u00F0ur").c_str(),
                ExtensionActionManager::Get(browser()->profile())->
                GetPageAction(*extension)->
                GetTitle(tab_id).c_str());
 }
 
 }  // namespace
 }  // namespace extensions