Stop showing page actions in the location bar with redesign enabled

chrome/browser/extensions/api/declarative_content/declarative_content_apitest.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 "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
+#include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/test_extension_dir.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/common/extensions/features/feature_channel.h"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace extensions {
 namespace {
 
 const char kDeclarativeContentManifest[] =
     "{\n"
@@ skipping 146 matching lines @@
             ExecuteScriptInBackgroundPage(extension_id, kTestRule));
 
   content::WebContents* const tab =
       browser()->tab_strip_model()->GetWebContentsAt(0);
   const int tab_id = ExtensionTabUtil::GetTabId(tab);
 
   NavigateInRenderer(tab, GURL("http://test/"));
 
   EXPECT_TRUE(page_action->GetIsVisible(tab_id));
   EXPECT_TRUE(WaitForPageActionVisibilityChangeTo(1));
-  LocationBarTesting* location_bar =
-      browser()->window()->GetLocationBar()->GetLocationBarForTesting();
-  EXPECT_EQ(1, location_bar->PageActionCount());
-  EXPECT_EQ(1, location_bar->PageActionVisibleCount());
+  EXPECT_EQ(1u, extension_action_test_util::GetVisiblePageActionCount(tab));
+  EXPECT_EQ(1u, extension_action_test_util::GetTotalPageActionCount(tab));
 
   ReloadExtension(extension_id);  // Invalidates page_action and extension.
   EXPECT_EQ("test_rule",
             ExecuteScriptInBackgroundPage(extension_id, kTestRule));
   // TODO(jyasskin): Apply new rules to existing tabs, without waiting for a
   // navigation.
   NavigateInRenderer(tab, GURL("http://test/"));
   EXPECT_TRUE(WaitForPageActionVisibilityChangeTo(1));
-  EXPECT_EQ(1, location_bar->PageActionCount());
-  EXPECT_EQ(1, location_bar->PageActionVisibleCount());
+  EXPECT_EQ(1u, extension_action_test_util::GetVisiblePageActionCount(tab));
+  EXPECT_EQ(1u, extension_action_test_util::GetTotalPageActionCount(tab));
 
   UnloadExtension(extension_id);
   NavigateInRenderer(tab, GURL("http://test/"));
   EXPECT_TRUE(WaitForPageActionVisibilityChangeTo(0));
-  EXPECT_EQ(0, location_bar->PageActionCount());
-  EXPECT_EQ(0, location_bar->PageActionVisibleCount());
+  EXPECT_EQ(0u, extension_action_test_util::GetVisiblePageActionCount(tab));
+  EXPECT_EQ(0u, extension_action_test_util::GetTotalPageActionCount(tab));
 }
 
 // This tests against a renderer crash that was present during development.
 IN_PROC_BROWSER_TEST_F(DeclarativeContentApiTest,
                        DISABLED_AddExtensionMatchingExistingTabWithDeadFrames) {
   ext_dir_.WriteManifest(kDeclarativeContentManifest);
   ext_dir_.WriteFile(FILE_PATH_LITERAL("background.js"), kBackgroundHelpers);
   content::WebContents* const tab =
       browser()->tab_strip_model()->GetWebContentsAt(0);
   const int tab_id = ExtensionTabUtil::GetTabId(tab);
@@ skipping 59 matching lines @@
                   "}], 'test_rule');\n"),
               testing::HasSubstr("without a page action"));
 
   content::WebContents* const tab =
       browser()->tab_strip_model()->GetWebContentsAt(0);
   NavigateInRenderer(tab, GURL("http://test/"));
 
   EXPECT_EQ(NULL,
             ExtensionActionManager::Get(browser()->profile())->
                 GetPageAction(*extension));
-  EXPECT_EQ(0,
-            browser()->window()->GetLocationBar()->GetLocationBarForTesting()->
-            PageActionCount());
+  EXPECT_EQ(0u, extension_action_test_util::GetVisiblePageActionCount(tab));
 }
 
 IN_PROC_BROWSER_TEST_F(DeclarativeContentApiTest,
                        CanonicalizesPageStateMatcherCss) {
   ext_dir_.WriteManifest(kDeclarativeContentManifest);
   ext_dir_.WriteFile(
       FILE_PATH_LITERAL("background.js"),
       "var PageStateMatcher = chrome.declarativeContent.PageStateMatcher;\n"
       "function Return(obj) {\n"
       "  window.domAutomationController.send('' + obj);\n"
@@ skipping 43 matching lines @@
                   "  new PageStateMatcher({css: ['div input']});\n"
                   "  Return('Failed to throw');\n"
                   "} catch (e) {\n"
                   "  Return(e.message);\n"
                   "}\n"),
               testing::ContainsRegex("compound selector.*: div input$"));
 }
 
 }  // namespace
 }  // namespace extensions