Stop showing page actions in the location bar with redesign enabled

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_action_test_util.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 "chrome/browser/ui/tabs/tab_strip_model.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 {
 
 // A callback that returns true if the condition has been met and takes no
 // arguments.
 typedef base::Callback<bool(void)> ConditionCallback;
 
 bool HasPageActionVisibilityReachedTarget(
-    LocationBarTesting* location_bar, int target_visible_page_action_count) {
-  return location_bar->PageActionVisibleCount() ==
-         target_visible_page_action_count;
+    Browser* browser, size_t target_visible_page_action_count) {
+  return extensions::extension_action_test_util::GetVisiblePageActionCount(
+      browser->tab_strip_model()->GetActiveWebContents()) ==
+      target_visible_page_action_count;
 }
 
 bool HaveAllExtensionRenderViewHostsFinishedLoading(
     extensions::ProcessManager* manager) {
   extensions::ProcessManager::ViewSet all_views = manager->GetAllViews();
   for (extensions::ProcessManager::ViewSet::const_iterator iter =
            all_views.begin();
        iter != all_views.end(); ++iter) {
     if ((*iter)->IsLoading())
       return false;
@@ skipping 76 matching lines @@
   // 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::WaitForPageActionVisibilityChangeTo(
     int count) {
-  LocationBarTesting* location_bar =
-      browser_->window()->GetLocationBar()->GetLocationBarForTesting();
   extensions::ExtensionActionAPI::Get(GetProfile())->AddObserver(this);
   WaitForCondition(
-      base::Bind(&HasPageActionVisibilityReachedTarget, location_bar, count),
+      base::Bind(&HasPageActionVisibilityReachedTarget, browser_, count),
       NULL);
   extensions::ExtensionActionAPI::Get(GetProfile())->
       RemoveObserver(this);
   return true;
 }
 
 bool ExtensionTestNotificationObserver::WaitForExtensionViewsToLoad() {
   extensions::ProcessManager* manager =
       extensions::ExtensionSystem::Get(GetProfile())->process_manager();
   NotificationSet notification_set;
@@ skipping 136 matching lines @@
   runner->Run();
 
   condition_.Reset();
   quit_closure_.Reset();
 }
 
 void ExtensionTestNotificationObserver::MaybeQuit() {
   if (condition_.Run())
     quit_closure_.Run();
 }