Clean up NOTIFICATION_EXTENSION_PAGE_ACTION_[ COUNT | VISIBILITY ]_CHANGED

chrome/browser/extensions/extension_test_notification_observer.cc

 // Copyright 2013 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 "chrome/browser/extensions/extension_test_notification_observer.h"
 
 #include "base/callback_list.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 
 using extensions::Extension;
 
 namespace {
 
-bool HasExtensionPageActionCountReachedTarget(LocationBarTesting* location_bar,
-                                              int target_page_action_count) {
-  VLOG(1) << "Number of page actions: " << location_bar->PageActionCount();
-  return location_bar->PageActionCount() == target_page_action_count;
-}
-
 bool HasExtensionPageActionVisibilityReachedTarget(
     LocationBarTesting* location_bar,
     int target_visible_page_action_count) {
   VLOG(1) << "Number of visible page actions: "
           << location_bar->PageActionVisibleCount();
   return location_bar->PageActionVisibleCount() ==
          target_visible_page_action_count;
 }
 
 bool HaveAllExtensionRenderViewHostsFinishedLoading(
@@ skipping 102 matching lines @@
   // TODO(bauerb): Using a WindowedNotificationObserver like this can break
   // easily, if the notification we're waiting for is sent before this method.
   // Change it so that the WindowedNotificationObserver is constructed earlier.
   content::NotificationRegistrar registrar;
   registrar.Add(
       this, notification_type, content::NotificationService::AllSources());
   content::WindowedNotificationObserver(
       notification_type, content::NotificationService::AllSources()).Wait();
 }
 
-bool ExtensionTestNotificationObserver::WaitForPageActionCountChangeTo(
-    int count) {
-  LocationBarTesting* location_bar =
-      browser_->window()->GetLocationBar()->GetLocationBarForTesting();
-  WaitForCondition(
-      base::Bind(
-          &HasExtensionPageActionCountReachedTarget, location_bar, count),
-      extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED);
-  return true;
-}
-
 bool ExtensionTestNotificationObserver::WaitForPageActionVisibilityChangeTo(
     int count) {
   LocationBarTesting* location_bar =
       browser_->window()->GetLocationBar()->GetLocationBarForTesting();
   WaitForCondition(
       base::Bind(
           &HasExtensionPageActionVisibilityReachedTarget, location_bar, count),
-      extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED);
+      extensions::NOTIFICATION_EXTENSION_PAGE_ACTIONS_UPDATED);
   return true;
 }
 
 bool ExtensionTestNotificationObserver::WaitForExtensionViewsToLoad() {
   extensions::ProcessManager* manager =
       extensions::ExtensionSystem::Get(GetProfile())->process_manager();
   NotificationSet notification_set;
   notification_set.Add(content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
   notification_set.Add(content::NOTIFICATION_LOAD_STOP);
   WaitForCondition(
@@ skipping 100 matching lines @@
     case extensions::NOTIFICATION_EXTENSION_LOAD_ERROR:
       VLOG(1) << "Got EXTENSION_LOAD_ERROR notification.";
       ++extension_load_errors_observed_;
       break;
 
     default:
       NOTREACHED();
       break;
   }
 }